Patch Detail
Show a patch.
GET /api/1.1/patches/15870/?format=api
{ "id": 15870, "url": "https://patchwork.libcamera.org/api/1.1/patches/15870/?format=api", "web_url": "https://patchwork.libcamera.org/patch/15870/", "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-31-laurent.pinchart@ideasonboard.com>", "date": "2022-05-10T11:51:27", "name": "[libcamera-devel,30/50] staging: media: imx: imx7-media-csi: Decouple from imx_media_dma_buf", "commit_ref": null, "pull_url": null, "state": "not-applicable", "archived": false, "hash": "94b447c5ae73caea682064dbee93333e46260b18", "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/15870/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/15870/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/15870/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 EBE6AC3274\n\tfor <parsemail@patchwork.libcamera.org>;\n\tTue, 10 May 2022 11:52:31 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id A1E4E65697;\n\tTue, 10 May 2022 13:52:31 +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 BB8DE65675\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 10 May 2022 13:52:22 +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 CE45FDFF;\n\tTue, 10 May 2022 13:52:21 +0200 (CEST)" ], "DKIM-Signature": [ "v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1652183551;\n\tbh=ugFiXGKljdu4sLM/6x0wIcV2N3AEtbDAbQDr0izYfQg=;\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=Ps11ts0RhJS0FtBu1jV8J8uVsaeUshto90hViFqmZ8GWMHdZOgqmVPTNMuYYu3I38\n\ttcD+2DW9s0YdJMBFX7tqenwtkzPpatUOewV1QKTfeQ0w+C74Aeyvbl8HkN2gZ20pZa\n\tqVYff8AL3KTmNdOro82pRGxLIO64RSYoEtddcCkDux4elqanAQ1yn8pqV1y6YLuL2o\n\t12KPsVTURC7lPTbkhDx1lT0Qbli32S0rCszaVkng6iaCzC4ytmP7CULAjIWPicFDF8\n\tRwEvLb2EeQ2WQCf++9S21z7/Z3xjjjKBLnpmXfGm+NH8uBKi0ZtExAm6DPgjKBdSZg\n\t8P5MYd0rJSpig==", "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1652183542;\n\tbh=ugFiXGKljdu4sLM/6x0wIcV2N3AEtbDAbQDr0izYfQg=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=hOR3WCFMQwJ+Scg0B0/2RwsnaSJD0h5a7JdgHtij4GqxvGcm4TT22gf+dRi9e+nOM\n\tHaSLyY1wXM2JCt6R/RI+i2xY6uoURmG/qXnPLeAnm+idci+3i8xgTA/YBb8gj+dZ+y\n\t6TttvRhAxTgqLHtJ7dL3eA0oJ7N7D+M0fBc0vvB4=" ], "Authentication-Results": "lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"hOR3WCFM\"; dkim-atps=neutral", "To": "libcamera-devel@lists.libcamera.org", "Date": "Tue, 10 May 2022 14:51:27 +0300", "Message-Id": "<20220510115147.19360-31-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 30/50] staging: media: imx:\n\timx7-media-csi: Decouple from imx_media_dma_buf", "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_dma_buf structure defined in shared helpers\nby duplicating it in the imx7-media-csi driver, along with the two small\nalloc and free functions. No functional change intended.\n\nSigned-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n---\n drivers/staging/media/imx/imx7-media-csi.c | 40 +++++++++++++++++++---\n 1 file changed, 36 insertions(+), 4 deletions(-)", "diff": "diff --git a/drivers/staging/media/imx/imx7-media-csi.c b/drivers/staging/media/imx/imx7-media-csi.c\nindex 5a5157d8b27b..05907d6257a8 100644\n--- a/drivers/staging/media/imx/imx7-media-csi.c\n+++ b/drivers/staging/media/imx/imx7-media-csi.c\n@@ -184,6 +184,12 @@ to_imx7_csi_vb2_buffer(struct vb2_buffer *vb)\n \treturn container_of(vbuf, struct imx7_csi_vb2_buffer, vbuf);\n }\n \n+struct imx7_csi_dma_buf {\n+\tvoid *virt;\n+\tdma_addr_t phys;\n+\tunsigned long len;\n+};\n+\n struct imx7_csi {\n \tstruct device *dev;\n \n@@ -227,7 +233,7 @@ struct imx7_csi {\n \n \t/* Buffers and streaming state */\n \tstruct imx7_csi_vb2_buffer *active_vb2_buf[2];\n-\tstruct imx_media_dma_buf underrun_buf;\n+\tstruct imx7_csi_dma_buf underrun_buf;\n \n \tbool is_streaming;\n \tint buf_num;\n@@ -415,12 +421,38 @@ static void imx7_csi_dma_unsetup_vb2_buf(struct imx7_csi *csi,\n \t}\n }\n \n+static void imx7_csi_free_dma_buf(struct imx7_csi *csi,\n+\t\t\t\t struct imx7_csi_dma_buf *buf)\n+{\n+\tif (buf->virt)\n+\t\tdma_free_coherent(csi->dev, buf->len, buf->virt, buf->phys);\n+\n+\tbuf->virt = NULL;\n+\tbuf->phys = 0;\n+}\n+\n+static int imx7_csi_alloc_dma_buf(struct imx7_csi *csi,\n+\t\t\t\t struct imx7_csi_dma_buf *buf, int size)\n+{\n+\timx7_csi_free_dma_buf(csi, buf);\n+\n+\tbuf->len = PAGE_ALIGN(size);\n+\tbuf->virt = dma_alloc_coherent(csi->dev, buf->len, &buf->phys,\n+\t\t\t\t GFP_DMA | GFP_KERNEL);\n+\tif (!buf->virt) {\n+\t\tdev_err(csi->dev, \"%s: failed\\n\", __func__);\n+\t\treturn -ENOMEM;\n+\t}\n+\n+\treturn 0;\n+}\n+\n static int imx7_csi_dma_setup(struct imx7_csi *csi)\n {\n \tint ret;\n \n-\tret = imx_media_alloc_dma_buf(csi->dev, &csi->underrun_buf,\n-\t\t\t\t csi->vdev_fmt.sizeimage);\n+\tret = imx7_csi_alloc_dma_buf(csi, &csi->underrun_buf,\n+\t\t\t\t csi->vdev_fmt.sizeimage);\n \tif (ret < 0) {\n \t\tv4l2_warn(&csi->sd, \"consider increasing the CMA area\\n\");\n \t\treturn ret;\n@@ -439,7 +471,7 @@ static void imx7_csi_dma_cleanup(struct imx7_csi *csi,\n \t\t\t\t enum vb2_buffer_state return_status)\n {\n \timx7_csi_dma_unsetup_vb2_buf(csi, return_status);\n-\timx_media_free_dma_buf(csi->dev, &csi->underrun_buf);\n+\timx7_csi_free_dma_buf(csi, &csi->underrun_buf);\n }\n \n static void imx7_csi_dma_stop(struct imx7_csi *csi)\n", "prefixes": [ "libcamera-devel", "30/50" ] }