Patch Detail
Show a patch.
GET /api/1.1/patches/15867/?format=api
{ "id": 15867, "url": "https://patchwork.libcamera.org/api/1.1/patches/15867/?format=api", "web_url": "https://patchwork.libcamera.org/patch/15867/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/1.1/projects/1/?format=api", "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-28-laurent.pinchart@ideasonboard.com>", "date": "2022-05-10T11:51:24", "name": "[libcamera-devel,27/50] staging: media: imx: imx7-media-csi: Decouple from imx_media_buffer", "commit_ref": null, "pull_url": null, "state": "not-applicable", "archived": false, "hash": "64a722382ca5e4711af8c3d695be2eed2a1f703c", "submitter": { "id": 2, "url": "https://patchwork.libcamera.org/api/1.1/people/2/?format=api", "name": "Laurent Pinchart", "email": "laurent.pinchart@ideasonboard.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/15867/mbox/", "series": [ { "id": 3106, "url": "https://patchwork.libcamera.org/api/1.1/series/3106/?format=api", "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/15867/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/15867/checks/", "tags": {}, "headers": { "Return-Path": "<libcamera-devel-bounces@lists.libcamera.org>", "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 D7940C326C\n\tfor <parsemail@patchwork.libcamera.org>;\n\tTue, 10 May 2022 11:52:29 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 6CDA36565D;\n\tTue, 10 May 2022 13:52:29 +0200 (CEST)", "from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 22C1B6566A\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 10 May 2022 13:52:20 +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 468A6D18;\n\tTue, 10 May 2022 13:52:19 +0200 (CEST)" ], "DKIM-Signature": [ "v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1652183549;\n\tbh=uhFYqlxRyJRQAdfliGJQT40i74qJsxgVla750D6q6kc=;\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=v8Ke3pDW4CaLp68OR8QIspc6CaRx1zUKrRcTnEeoUfvtd2ttAqpPZTUFxeKB5sCyX\n\thcrGKToBDm0lSaXGawdTWEOqK3FCeqOsSq4Il4kjiap02oKigVpPSlo82/ihr13C0J\n\t4Dpay1wOTMyJlQGq1VGhmkK9sj60f6/+Y652Fbl78Rwaf8YHDeN7EG5G6cXaVauKWo\n\td3sabmwTEe78BVpCE8XuDsPMPTUdBErFIQXtY/SGwQ4GHzvwAviXldMjZF5nT/p/mE\n\to0rB/6JwUufRFwvwUQ+U+Gm6KIgHJKf7wn7E5kw9NtJR+5F2MZXvLMmHriAAtfAtO/\n\twb46FWjZOmosw==", "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1652183539;\n\tbh=uhFYqlxRyJRQAdfliGJQT40i74qJsxgVla750D6q6kc=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=eGGHrcyXHqByGfSrxUtQoweQVkNfMZBpUtmRngpTySGnhKo8HKKCsr6FziL5Al2iY\n\tO9mTi8BQkhmqDA2qkpaoxkw2r6uiTE3fvRyGmmvK+AMLbC16rVasVJA5Sdn+jHhA2j\n\t22pctdjDffwm5+ddD/FUw+NTxyE4kFCqM3Jl7yGc=" ], "Authentication-Results": "lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"eGGHrcyX\"; dkim-atps=neutral", "To": "libcamera-devel@lists.libcamera.org", "Date": "Tue, 10 May 2022 14:51:24 +0300", "Message-Id": "<20220510115147.19360-28-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 27/50] staging: media: imx:\n\timx7-media-csi: Decouple from imx_media_buffer", "X-BeenThere": "libcamera-devel@lists.libcamera.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "<libcamera-devel.lists.libcamera.org>", "List-Unsubscribe": "<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>", "List-Archive": "<https://lists.libcamera.org/pipermail/libcamera-devel/>", "List-Post": "<mailto:libcamera-devel@lists.libcamera.org>", "List-Help": "<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>", "List-Subscribe": "<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>", "From": "Laurent Pinchart via libcamera-devel\n\t<libcamera-devel@lists.libcamera.org>", "Reply-To": "Laurent Pinchart <laurent.pinchart@ideasonboard.com>", "Cc": "Martin Kepplinger <martin.kepplinger@puri.sm>, kernel@pengutronix.de,\n\tDorota Czaplejewicz <dorota.czaplejewicz@puri.sm>,\n\tAlexander Stein <alexander.stein@ew.tq-group.com>,\n\tRui Miguel Silva <rmfrfs@gmail.com>,\n\tPhilipp Zabel <p.zabel@pengutronix.de>, \n\tSteve Longerbeam <slongerbeam@gmail.com>", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "Decouple from the imx_media_buffer structure defined in shared helpers\nby duplicating it in the imx7-media-csi driver. No functional change\nintended.\n\nSigned-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n---\n drivers/staging/media/imx/imx7-media-csi.c | 41 ++++++++++++++--------\n 1 file changed, 27 insertions(+), 14 deletions(-)", "diff": "diff --git a/drivers/staging/media/imx/imx7-media-csi.c b/drivers/staging/media/imx/imx7-media-csi.c\nindex b116f6ab96f0..bd1bc3fada2e 100644\n--- a/drivers/staging/media/imx/imx7-media-csi.c\n+++ b/drivers/staging/media/imx/imx7-media-csi.c\n@@ -171,6 +171,19 @@ enum imx_csi_model {\n \tIMX7_CSI_IMX8MQ,\n };\n \n+struct imx7_csi_vb2_buffer {\n+\tstruct vb2_v4l2_buffer vbuf;\n+\tstruct list_head list;\n+};\n+\n+static inline struct imx7_csi_vb2_buffer *\n+to_imx7_csi_vb2_buffer(struct vb2_buffer *vb)\n+{\n+\tstruct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);\n+\n+\treturn container_of(vbuf, struct imx7_csi_vb2_buffer, vbuf);\n+}\n+\n struct imx7_csi {\n \tstruct device *dev;\n \n@@ -209,7 +222,7 @@ struct imx7_csi {\n \tspinlock_t q_lock;\t\t\t/* Protect ready_q */\n \n \t/* Buffers and streaming state */\n-\tstruct imx_media_buffer *active_vb2_buf[2];\n+\tstruct imx7_csi_vb2_buffer *active_vb2_buf[2];\n \tstruct imx_media_dma_buf underrun_buf;\n \n \tbool is_streaming;\n@@ -355,11 +368,11 @@ static void imx7_csi_update_buf(struct imx7_csi *csi, dma_addr_t phys,\n \t\timx7_csi_reg_write(csi, phys, CSI_CSIDMASA_FB1);\n }\n \n-static struct imx_media_buffer *imx7_csi_video_next_buf(struct imx7_csi *csi);\n+static struct imx7_csi_vb2_buffer *imx7_csi_video_next_buf(struct imx7_csi *csi);\n \n static void imx7_csi_setup_vb2_buf(struct imx7_csi *csi)\n {\n-\tstruct imx_media_buffer *buf;\n+\tstruct imx7_csi_vb2_buffer *buf;\n \tstruct vb2_buffer *vb2_buf;\n \tdma_addr_t phys[2];\n \tint i;\n@@ -382,7 +395,7 @@ static void imx7_csi_setup_vb2_buf(struct imx7_csi *csi)\n static void imx7_csi_dma_unsetup_vb2_buf(struct imx7_csi *csi,\n \t\t\t\t\t enum vb2_buffer_state return_status)\n {\n-\tstruct imx_media_buffer *buf;\n+\tstruct imx7_csi_vb2_buffer *buf;\n \tint i;\n \n \t/* return any remaining active frames with return_status */\n@@ -652,7 +665,7 @@ static void imx7_csi_error_recovery(struct imx7_csi *csi)\n static void imx7_csi_vb2_buf_done(struct imx7_csi *csi)\n {\n \tstruct imx_media_video_dev *vdev = &csi->vdev;\n-\tstruct imx_media_buffer *done, *next;\n+\tstruct imx7_csi_vb2_buffer *done, *next;\n \tstruct vb2_buffer *vb;\n \tdma_addr_t phys;\n \n@@ -997,7 +1010,7 @@ static int imx7_csi_video_queue_setup(struct vb2_queue *vq,\n \n static int imx7_csi_video_buf_init(struct vb2_buffer *vb)\n {\n-\tstruct imx_media_buffer *buf = to_imx_media_vb(vb);\n+\tstruct imx7_csi_vb2_buffer *buf = to_imx7_csi_vb2_buffer(vb);\n \n \tINIT_LIST_HEAD(&buf->list);\n \n@@ -1024,7 +1037,7 @@ static int imx7_csi_video_buf_prepare(struct vb2_buffer *vb)\n static void imx7_csi_video_buf_queue(struct vb2_buffer *vb)\n {\n \tstruct imx7_csi *csi = vb2_get_drv_priv(vb->vb2_queue);\n-\tstruct imx_media_buffer *buf = to_imx_media_vb(vb);\n+\tstruct imx7_csi_vb2_buffer *buf = to_imx7_csi_vb2_buffer(vb);\n \tunsigned long flags;\n \n \tspin_lock_irqsave(&csi->q_lock, flags);\n@@ -1073,7 +1086,7 @@ static int imx7_csi_video_start_streaming(struct vb2_queue *vq,\n \t\t\t\t\t unsigned int count)\n {\n \tstruct imx7_csi *csi = vb2_get_drv_priv(vq);\n-\tstruct imx_media_buffer *buf, *tmp;\n+\tstruct imx7_csi_vb2_buffer *buf, *tmp;\n \tunsigned long flags;\n \tint ret;\n \n@@ -1115,8 +1128,8 @@ static int imx7_csi_video_start_streaming(struct vb2_queue *vq,\n static void imx7_csi_video_stop_streaming(struct vb2_queue *vq)\n {\n \tstruct imx7_csi *csi = vb2_get_drv_priv(vq);\n-\tstruct imx_media_buffer *frame;\n-\tstruct imx_media_buffer *tmp;\n+\tstruct imx7_csi_vb2_buffer *frame;\n+\tstruct imx7_csi_vb2_buffer *tmp;\n \tunsigned long flags;\n \n \tmutex_lock(&csi->mdev.graph_mutex);\n@@ -1205,16 +1218,16 @@ static const struct v4l2_file_operations imx7_csi_video_fops = {\n * Video Capture Device - Init & Cleanup\n */\n \n-static struct imx_media_buffer *imx7_csi_video_next_buf(struct imx7_csi *csi)\n+static struct imx7_csi_vb2_buffer *imx7_csi_video_next_buf(struct imx7_csi *csi)\n {\n-\tstruct imx_media_buffer *buf = NULL;\n+\tstruct imx7_csi_vb2_buffer *buf = NULL;\n \tunsigned long flags;\n \n \tspin_lock_irqsave(&csi->q_lock, flags);\n \n \t/* get next queued buffer */\n \tif (!list_empty(&csi->ready_q)) {\n-\t\tbuf = list_entry(csi->ready_q.next, struct imx_media_buffer,\n+\t\tbuf = list_entry(csi->ready_q.next, struct imx7_csi_vb2_buffer,\n \t\t\t\t list);\n \t\tlist_del(&buf->list);\n \t}\n@@ -1336,7 +1349,7 @@ static int imx7_csi_video_init(struct imx7_csi *csi)\n \tvq->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;\n \tvq->io_modes = VB2_MMAP | VB2_DMABUF;\n \tvq->drv_priv = csi;\n-\tvq->buf_struct_size = sizeof(struct imx_media_buffer);\n+\tvq->buf_struct_size = sizeof(struct imx7_csi_vb2_buffer);\n \tvq->ops = &imx7_csi_video_qops;\n \tvq->mem_ops = &vb2_dma_contig_memops;\n \tvq->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;\n", "prefixes": [ "libcamera-devel", "27/50" ] }