{"id":15876,"url":"https://patchwork.libcamera.org/api/patches/15876/?format=json","web_url":"https://patchwork.libcamera.org/patch/15876/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/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-37-laurent.pinchart@ideasonboard.com>","date":"2022-05-10T11:51:33","name":"[libcamera-devel,36/50] staging: media: imx: imx7-media-csi: Drop IPU-only formats","commit_ref":null,"pull_url":null,"state":"not-applicable","archived":false,"hash":"0261ad232ac9314e7ab7a6079c8f10cda667826e","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/?format=json","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/15876/mbox/","series":[{"id":3106,"url":"https://patchwork.libcamera.org/api/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/15876/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/15876/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 EB4F2C3277\n\tfor <parsemail@patchwork.libcamera.org>;\n\tTue, 10 May 2022 11:52:36 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 7D081656AE;\n\tTue, 10 May 2022 13:52:36 +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 C1DD765652\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 10 May 2022 13:52:27 +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 E7E30BA9;\n\tTue, 10 May 2022 13:52:26 +0200 (CEST)"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1652183556;\n\tbh=Nsc9cQrGdNHUTWWL9yyzYak+ErdyW8aB4BwSgWgEAM0=;\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=bJp5xBMRL1WlntWaV7ARZC67dNzHIjdMEESKRQW9l6II3SgnRVoJ8AN49fM9efFzN\n\teYpI9Mu5+A7cuMJollOVjrVk4hpGo98B62gfVhn5Q4yELq+tq66ZsjZkZc2H4T7CPO\n\t4B+xrFXKZ+fB/KcRtMXw3vff7uSmqjl/V1xGM6cw17T9UtsjH5kWLqA3RsiLa+gdJw\n\tWmtFdO8JYf7SLLX0fHjaGSvyzIvejaCwA59yhD1uO8+t8zSsSv805SOyY7Fsd6vTMk\n\tBEQOhv730gIU23azDFfGgBNHrkDn/YowNb42S+fahhI4umzUUrg3Cda2KY/Dg9muFD\n\tVT3UxLi0+yUXg==","v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1652183547;\n\tbh=Nsc9cQrGdNHUTWWL9yyzYak+ErdyW8aB4BwSgWgEAM0=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=VnA9hCmm+SGSw9e8Edn6yPbfsnAemHSJsxinZmjxlxh+9CQ17A6lF09npC90UEaN4\n\tC5WoWzzbc/CJe5+POaS0zhDT+gcSvdwYOGcArkCdnND3SpcUiq8/ZmNdmI+LlN2GvP\n\tntOKFSiaogJbdshqOJ/mliegGcrFTvhpYKnwKDi4="],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"VnA9hCmm\"; dkim-atps=neutral","To":"libcamera-devel@lists.libcamera.org","Date":"Tue, 10 May 2022 14:51:33 +0300","Message-Id":"<20220510115147.19360-37-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 36/50] staging: media: imx:\n\timx7-media-csi: Drop IPU-only formats","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":"The formats specific to the IPUv3 are not supported by the CSI bridge.\nDrop them, along with the related code.\n\nSigned-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n---\n drivers/staging/media/imx/imx7-media-csi.c | 98 ++--------------------\n 1 file changed, 6 insertions(+), 92 deletions(-)","diff":"diff --git a/drivers/staging/media/imx/imx7-media-csi.c b/drivers/staging/media/imx/imx7-media-csi.c\nindex c8ff259452b1..17259922a082 100644\n--- a/drivers/staging/media/imx/imx7-media-csi.c\n+++ b/drivers/staging/media/imx/imx7-media-csi.c\n@@ -188,7 +188,6 @@ struct imx7_csi_pixfmt {\n \tbool\tyuv;\n \tbool    planar;  /* is a planar format */\n \tbool    bayer;   /* is a raw bayer format */\n-\tbool    ipufmt;  /* is one of the IPU internal formats */\n };\n \n struct imx7_csi_vb2_buffer {\n@@ -811,7 +810,6 @@ enum imx7_csi_pixfmt_sel {\n \tIMX7_CSI_PIXFMT_SEL_YUV   = BIT(0), /* select YUV formats */\n \tIMX7_CSI_PIXFMT_SEL_RGB   = BIT(1), /* select RGB formats */\n \tIMX7_CSI_PIXFMT_SEL_BAYER = BIT(2), /* select BAYER formats */\n-\tIMX7_CSI_PIXFMT_SEL_IPU   = BIT(3), /* select IPU-internal formats */\n \tIMX7_CSI_PIXFMT_SEL_YUV_RGB = IMX7_CSI_PIXFMT_SEL_YUV\n \t\t\t\t    | IMX7_CSI_PIXFMT_SEL_RGB,\n \tIMX7_CSI_PIXFMT_SEL_ANY = IMX7_CSI_PIXFMT_SEL_YUV\n@@ -865,12 +863,6 @@ static const struct imx7_csi_pixfmt pixel_formats[] = {\n \t\t.yuv\t= true,\n \t\t.bpp    = 16,\n \t\t.planar = true,\n-\t}, {\n-\t\t.fourcc = V4L2_PIX_FMT_YUV32,\n-\t\t.codes  = IMX_BUS_FMTS(MEDIA_BUS_FMT_AYUV8_1X32),\n-\t\t.yuv\t= true,\n-\t\t.bpp    = 32,\n-\t\t.ipufmt = true,\n \t},\n \t/*** RGB formats start here ***/\n \t{\n@@ -892,11 +884,6 @@ static const struct imx7_csi_pixfmt pixel_formats[] = {\n \t\t.fourcc\t= V4L2_PIX_FMT_XRGB32,\n \t\t.codes  = IMX_BUS_FMTS(MEDIA_BUS_FMT_ARGB8888_1X32),\n \t\t.bpp    = 32,\n-\t}, {\n-\t\t.fourcc\t= V4L2_PIX_FMT_XRGB32,\n-\t\t.codes  = IMX_BUS_FMTS(MEDIA_BUS_FMT_ARGB8888_1X32),\n-\t\t.bpp    = 32,\n-\t\t.ipufmt = true,\n \t}, {\n \t\t.fourcc\t= V4L2_PIX_FMT_XBGR32,\n \t\t.bpp    = 32,\n@@ -1000,18 +987,12 @@ static const struct imx7_csi_pixfmt pixel_formats[] = {\n static const struct imx7_csi_pixfmt *\n imx7_csi_find_pixel_format(u32 fourcc, enum imx7_csi_pixfmt_sel fmt_sel)\n {\n-\tbool sel_ipu = fmt_sel & IMX7_CSI_PIXFMT_SEL_IPU;\n \tunsigned int i;\n \n-\tfmt_sel &= ~IMX7_CSI_PIXFMT_SEL_IPU;\n-\n \tfor (i = 0; i < ARRAY_SIZE(pixel_formats); i++) {\n \t\tconst struct imx7_csi_pixfmt *fmt = &pixel_formats[i];\n \t\tenum imx7_csi_pixfmt_sel sel;\n \n-\t\tif (sel_ipu != fmt->ipufmt)\n-\t\t\tcontinue;\n-\n \t\tsel = fmt->bayer ? IMX7_CSI_PIXFMT_SEL_BAYER\n \t\t    : (fmt->yuv ? IMX7_CSI_PIXFMT_SEL_YUV :\n \t\t       IMX7_CSI_PIXFMT_SEL_RGB);\n@@ -1033,19 +1014,13 @@ imx7_csi_find_pixel_format(u32 fourcc, enum imx7_csi_pixfmt_sel fmt_sel)\n static const struct imx7_csi_pixfmt *\n imx7_csi_find_mbus_format(u32 code, enum imx7_csi_pixfmt_sel fmt_sel)\n {\n-\tbool sel_ipu = fmt_sel & IMX7_CSI_PIXFMT_SEL_IPU;\n \tunsigned int i;\n \n-\tfmt_sel &= ~IMX7_CSI_PIXFMT_SEL_IPU;\n-\n \tfor (i = 0; i < ARRAY_SIZE(pixel_formats); i++) {\n \t\tconst struct imx7_csi_pixfmt *fmt = &pixel_formats[i];\n \t\tenum imx7_csi_pixfmt_sel sel;\n \t\tunsigned int j;\n \n-\t\tif (sel_ipu != fmt->ipufmt)\n-\t\t\tcontinue;\n-\n \t\tsel = fmt->bayer ? IMX7_CSI_PIXFMT_SEL_BAYER\n \t\t    : (fmt->yuv ? IMX7_CSI_PIXFMT_SEL_YUV :\n \t\t       IMX7_CSI_PIXFMT_SEL_RGB);\n@@ -1062,12 +1037,6 @@ imx7_csi_find_mbus_format(u32 code, enum imx7_csi_pixfmt_sel fmt_sel)\n \treturn NULL;\n }\n \n-static inline const struct imx7_csi_pixfmt *\n-imx7_csi_find_ipu_format(u32 code, enum imx7_csi_pixfmt_sel fmt_sel)\n-{\n-\treturn imx7_csi_find_mbus_format(code, fmt_sel | IMX7_CSI_PIXFMT_SEL_IPU);\n-}\n-\n /*\n  * Enumerate entries in the pixel_formats[] array that match the\n  * requested selection criteria. Return the fourcc that matches the\n@@ -1085,18 +1054,12 @@ static int imx7_csi_enum_pixel_formats(u32 *fourcc, u32 index,\n \t\t\t\t       enum imx7_csi_pixfmt_sel fmt_sel,\n \t\t\t\t       u32 code)\n {\n-\tbool sel_ipu = fmt_sel & IMX7_CSI_PIXFMT_SEL_IPU;\n \tunsigned int i;\n \n-\tfmt_sel &= ~IMX7_CSI_PIXFMT_SEL_IPU;\n-\n \tfor (i = 0; i < ARRAY_SIZE(pixel_formats); i++) {\n \t\tconst struct imx7_csi_pixfmt *fmt = &pixel_formats[i];\n \t\tenum imx7_csi_pixfmt_sel sel;\n \n-\t\tif (sel_ipu != fmt->ipufmt)\n-\t\t\tcontinue;\n-\n \t\tsel = fmt->bayer ? IMX7_CSI_PIXFMT_SEL_BAYER\n \t\t    : (fmt->yuv ? IMX7_CSI_PIXFMT_SEL_YUV :\n \t\t       IMX7_CSI_PIXFMT_SEL_RGB);\n@@ -1148,19 +1111,13 @@ static int imx7_csi_enum_pixel_formats(u32 *fourcc, u32 index,\n static int imx7_csi_enum_mbus_formats(u32 *code, u32 index,\n \t\t\t\t      enum imx7_csi_pixfmt_sel fmt_sel)\n {\n-\tbool sel_ipu = fmt_sel & IMX7_CSI_PIXFMT_SEL_IPU;\n \tunsigned int i;\n \n-\tfmt_sel &= ~IMX7_CSI_PIXFMT_SEL_IPU;\n-\n \tfor (i = 0; i < ARRAY_SIZE(pixel_formats); i++) {\n \t\tconst struct imx7_csi_pixfmt *fmt = &pixel_formats[i];\n \t\tenum imx7_csi_pixfmt_sel sel;\n \t\tunsigned int j;\n \n-\t\tif (sel_ipu != fmt->ipufmt)\n-\t\t\tcontinue;\n-\n \t\tsel = fmt->bayer ? IMX7_CSI_PIXFMT_SEL_BAYER\n \t\t    : (fmt->yuv ? IMX7_CSI_PIXFMT_SEL_YUV :\n \t\t       IMX7_CSI_PIXFMT_SEL_RGB);\n@@ -1195,11 +1152,8 @@ static int imx7_csi_init_mbus_fmt(struct v4l2_mbus_framefmt *mbus,\n \t\timx7_csi_enum_mbus_formats(&code, 0, IMX7_CSI_PIXFMT_SEL_YUV);\n \n \tlcc = imx7_csi_find_mbus_format(code, IMX7_CSI_PIXFMT_SEL_ANY);\n-\tif (!lcc) {\n-\t\tlcc = imx7_csi_find_ipu_format(code, IMX7_CSI_PIXFMT_SEL_YUV_RGB);\n-\t\tif (!lcc)\n-\t\t\treturn -EINVAL;\n-\t}\n+\tif (!lcc)\n+\t\treturn -EINVAL;\n \n \tmbus->code = code;\n \n@@ -1225,26 +1179,12 @@ static int imx7_csi_mbus_fmt_to_pix_fmt(struct v4l2_pix_format *pix,\n \tu32 stride;\n \n \tif (!cc) {\n-\t\tcc = imx7_csi_find_ipu_format(mbus->code,\n-\t\t\t\t\t      IMX7_CSI_PIXFMT_SEL_YUV_RGB);\n-\t\tif (!cc)\n-\t\t\tcc = imx7_csi_find_mbus_format(mbus->code,\n-\t\t\t\t\t\t       IMX7_CSI_PIXFMT_SEL_ANY);\n+\t\tcc = imx7_csi_find_mbus_format(mbus->code,\n+\t\t\t\t\t       IMX7_CSI_PIXFMT_SEL_ANY);\n \t\tif (!cc)\n \t\t\treturn -EINVAL;\n \t}\n \n-\t/*\n-\t * TODO: the IPU currently does not support the AYUV32 format,\n-\t * so until it does convert to a supported YUV format.\n-\t */\n-\tif (cc->ipufmt && cc->yuv) {\n-\t\tu32 code;\n-\n-\t\timx7_csi_enum_mbus_formats(&code, 0, IMX7_CSI_PIXFMT_SEL_YUV);\n-\t\tcc = imx7_csi_find_mbus_format(code, IMX7_CSI_PIXFMT_SEL_YUV);\n-\t}\n-\n \t/* Round up width for minimum burst size */\n \twidth = round_up(mbus->width, 8);\n \n@@ -1273,29 +1213,6 @@ static int imx7_csi_mbus_fmt_to_pix_fmt(struct v4l2_pix_format *pix,\n  * Video Capture Device - IOCTLs\n  */\n \n-static const struct imx7_csi_pixfmt *\n-imx7_csi_video_find_format(u32 code, u32 fourcc)\n-{\n-\tconst struct imx7_csi_pixfmt *cc;\n-\n-\tcc = imx7_csi_find_ipu_format(code, IMX7_CSI_PIXFMT_SEL_YUV_RGB);\n-\tif (cc) {\n-\t\tenum imx7_csi_pixfmt_sel fmt_sel = cc->yuv\n-\t\t\t\t\t\t ? IMX7_CSI_PIXFMT_SEL_YUV\n-\t\t\t\t\t\t : IMX7_CSI_PIXFMT_SEL_RGB;\n-\n-\t\tcc = imx7_csi_find_pixel_format(fourcc, fmt_sel);\n-\t\tif (!cc) {\n-\t\t\timx7_csi_enum_pixel_formats(&fourcc, 0, fmt_sel, 0);\n-\t\t\tcc = imx7_csi_find_pixel_format(fourcc, fmt_sel);\n-\t\t}\n-\n-\t\treturn cc;\n-\t}\n-\n-\treturn imx7_csi_find_mbus_format(code, IMX7_CSI_PIXFMT_SEL_ANY);\n-}\n-\n static int imx7_csi_video_querycap(struct file *file, void *fh,\n \t\t\t\t   struct v4l2_capability *cap)\n {\n@@ -1598,7 +1515,8 @@ static int imx7_csi_video_validate_fmt(struct imx7_csi *csi)\n \t * Verify that the media bus code is compatible with the pixel format\n \t * set on the video node.\n \t */\n-\tcc = imx7_csi_video_find_format(fmt_src.format.code, 0);\n+\tcc = imx7_csi_find_mbus_format(fmt_src.format.code,\n+\t\t\t\t       IMX7_CSI_PIXFMT_SEL_ANY);\n \tif (!cc || csi->vdev_cc->yuv != cc->yuv)\n \t\treturn -EPIPE;\n \n@@ -2038,10 +1956,6 @@ static void imx7_csi_try_colorimetry(struct v4l2_mbus_framefmt *tryfmt)\n \tbool is_rgb = false;\n \n \tcc = imx7_csi_find_mbus_format(tryfmt->code, IMX7_CSI_PIXFMT_SEL_ANY);\n-\tif (!cc)\n-\t\tcc = imx7_csi_find_ipu_format(tryfmt->code,\n-\t\t\t\t\t      IMX7_CSI_PIXFMT_SEL_YUV_RGB);\n-\n \tif (cc && !cc->yuv)\n \t\tis_rgb = true;\n \n","prefixes":["libcamera-devel","36/50"]}