{"id":15854,"url":"https://patchwork.libcamera.org/api/1.1/patches/15854/?format=json","web_url":"https://patchwork.libcamera.org/patch/15854/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20220510115147.19360-15-laurent.pinchart@ideasonboard.com>","date":"2022-05-10T11:51:11","name":"[libcamera-devel,14/50] staging: media: imx: imx7-media-csi: Reorganize imx7_csi structure","commit_ref":null,"pull_url":null,"state":"not-applicable","archived":false,"hash":"3739489168caeb3b48f2f9b9c519512fffe6bd82","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/1.1/people/2/?format=json","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/15854/mbox/","series":[{"id":3106,"url":"https://patchwork.libcamera.org/api/1.1/series/3106/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=3106","date":"2022-05-10T11:50:57","name":"staging: media: imx: Prepare destaging of imx7-media-csi","version":1,"mbox":"https://patchwork.libcamera.org/series/3106/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/15854/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/15854/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id 253B6C3256\n\tfor ;\n\tTue, 10 May 2022 11:52:16 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id A5F6D65660;\n\tTue, 10 May 2022 13:52:15 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 273AF65667\n\tfor ;\n\tTue, 10 May 2022 13:52:09 +0200 (CEST)","from pendragon.lan (62-78-145-57.bb.dnainternet.fi [62.78.145.57])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 4B24FBA9;\n\tTue, 10 May 2022 13:52:08 +0200 (CEST)"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1652183535;\n\tbh=VV3eplvYk/sJft+X1ditSjuXp/Rm1i02+4x1EUzfKII=;\n\th=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe:\n\tList-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc:\n\tFrom;\n\tb=ny8yUBQErI5Pa3UVjeImhEpkCC4VcNg7Wrcr1svOrOhP0ax0nlI5s8wyFIk44aYWu\n\tbIaV3IBeuXf4RovoOG+mr+rgjahqHhJ/irP4M+QD4RBiYxoqv/H9G6JXNiRR8cJDzg\n\tZ2TX4fm5Jze9wpPgvAszj+Bu9lNpHUYLUB23piGvEob7JqMsZIJGVXnqQJvdf75LDL\n\tTlP/zSoLWGH/D33KkSJRbAaN9ljXrbEVL8PbX2HuDKgtM3N0LCAsHgPgdgnvIBl77D\n\tEL0s9N4ifnNq1zXkARqTM5LhioX6CHq7tlsJvYJWxrvkxubuvLkDMPCC065UqsJPMN\n\toItAxw9XcKofg==","v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1652183528;\n\tbh=VV3eplvYk/sJft+X1ditSjuXp/Rm1i02+4x1EUzfKII=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=f4lQBRJXyL8L/g1QX9TJGNogUL/qN2UWmnx1I5KSRorjjzYYiAj15S+ZuDXPt4AfL\n\tjAAs4K2G6b7xwCsR3U7/1XsekDe+QmO2tiObIluxDyzO9u4OM/poNfJnlx5g31ZAty\n\tJV6Tiepe4fH5sv2NKCWbklnqha6hclrJwEDueEHA="],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"f4lQBRJX\"; dkim-atps=neutral","To":"libcamera-devel@lists.libcamera.org","Date":"Tue, 10 May 2022 14:51:11 +0300","Message-Id":"<20220510115147.19360-15-laurent.pinchart@ideasonboard.com>","X-Mailer":"git-send-email 2.35.1","In-Reply-To":"<20220510115147.19360-1-laurent.pinchart@ideasonboard.com>","References":"<20220510115147.19360-1-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH 14/50] staging: media: imx:\n\timx7-media-csi: Reorganize imx7_csi structure","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","From":"Laurent Pinchart via libcamera-devel\n\t","Reply-To":"Laurent Pinchart ","Cc":"Martin Kepplinger , kernel@pengutronix.de,\n\tDorota Czaplejewicz ,\n\tAlexander Stein ,\n\tRui Miguel Silva ,\n\tPhilipp Zabel , \n\tSteve Longerbeam ","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"The struct imx7_csi fields are in a random order, reorganize them\nlogically to prepare for adding new fields.\n\nSigned-off-by: Laurent Pinchart \n---\n drivers/staging/media/imx/imx7-media-csi.c | 36 ++++++++++++----------\n 1 file changed, 20 insertions(+), 16 deletions(-)","diff":"diff --git a/drivers/staging/media/imx/imx7-media-csi.c b/drivers/staging/media/imx/imx7-media-csi.c\nindex 499bb74ad6f3..ad69c2e8dbc2 100644\n--- a/drivers/staging/media/imx/imx7-media-csi.c\n+++ b/drivers/staging/media/imx/imx7-media-csi.c\n@@ -169,37 +169,41 @@ enum imx_csi_model {\n \n struct imx7_csi {\n \tstruct device *dev;\n-\tstruct v4l2_subdev sd;\n+\n+\t/* Resources and locks */\n+\tvoid __iomem *regbase;\n+\tint irq;\n+\tstruct clk *mclk;\n+\n+\tstruct mutex lock; /* Protects is_streaming, format_mbus, cc */\n+\tspinlock_t irqlock; /* Protects last_eof */\n+\n+\t/* Media and V4L2 device */\n+\tstruct imx_media_dev *imxmd;\n \tstruct v4l2_async_notifier notifier;\n-\tstruct imx_media_video_dev *vdev;\n-\tstruct imx_media_dev *imxmd;\n-\tstruct media_pad pad[IMX7_CSI_PADS_NUM];\n-\n-\t/* lock to protect members below */\n-\tstruct mutex lock;\n-\t/* lock to protect irq handler when stop streaming */\n-\tspinlock_t irqlock;\n \n \tstruct v4l2_subdev *src_sd;\n+\tbool is_csi2;\n+\n+\t/* V4L2 subdev */\n+\tstruct v4l2_subdev sd;\n+\tstruct media_pad pad[IMX7_CSI_PADS_NUM];\n \n \tstruct v4l2_mbus_framefmt format_mbus[IMX7_CSI_PADS_NUM];\n \tconst struct imx_media_pixfmt *cc[IMX7_CSI_PADS_NUM];\n \n-\tvoid __iomem *regbase;\n-\tint irq;\n-\tstruct clk *mclk;\n+\t/* Video device */\n+\tstruct imx_media_video_dev *vdev;\n \n-\t/* active vb2 buffers to send to video dev sink */\n+\t/* Buffers and streaming state */\n \tstruct imx_media_buffer *active_vb2_buf[2];\n \tstruct imx_media_dma_buf underrun_buf;\n \n+\tbool is_streaming;\n \tint buf_num;\n \tu32 frame_sequence;\n \n \tbool last_eof;\n-\tbool is_streaming;\n-\tbool is_csi2;\n-\n \tstruct completion last_eof_completion;\n \n \tenum imx_csi_model model;\n","prefixes":["libcamera-devel","14/50"]}