{"id":15882,"url":"https://patchwork.libcamera.org/api/1.1/patches/15882/?format=json","web_url":"https://patchwork.libcamera.org/patch/15882/","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-43-laurent.pinchart@ideasonboard.com>","date":"2022-05-10T11:51:39","name":"[libcamera-devel,42/50] staging: media: imx: imx7-media-csi: Drop unneeded imx7_csi_pixfmt fields","commit_ref":null,"pull_url":null,"state":"not-applicable","archived":false,"hash":"f07a3efee6a1b7c81846abd1d959591573d9ab07","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/15882/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/15882/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/15882/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 E6A23C327A\n\tfor ;\n\tTue, 10 May 2022 11:52:42 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 7901D656B4;\n\tTue, 10 May 2022 13:52:42 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 120236568E\n\tfor ;\n\tTue, 10 May 2022 13:52:32 +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 1712CBA9;\n\tTue, 10 May 2022 13:52:32 +0200 (CEST)"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1652183562;\n\tbh=pioge0W9Z06hO1XUA2h1cbvmUn6QLKoWaFjAWPtWIa4=;\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=jxLvCxy/EKpeDjV30bnxAxKY8ah2VONskHZVd1ZuqKkSKbSDqdJ0qgLq2YkSbOa9F\n\t1o+RkbswFZJ//+7gXzq0WOuUsojfIyazl2ZHIObns4uiu7rLwAuTaRz41o3EZtZQE4\n\tlnnBQLDjW+AUrsx0rgBimETDqjO8XzUvnAaCnIoFTYux/I5ojWLH4VW6kNAfuzkyfM\n\tWLiyb+QCwGH2pkvU15WaH/AmxmwwtZ6VqsgKCquHkJbN+Sez1jl4OopxWSkiKko+L0\n\tHh4FxczERWrsvbqgv6bxKTdrahHf65sdiWiVQ57IkOV1GYQztIjb8XBO0ytfjxiMAN\n\tLjas8zLL4cdYg==","v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1652183552;\n\tbh=pioge0W9Z06hO1XUA2h1cbvmUn6QLKoWaFjAWPtWIa4=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=j+2UmfF1Qwt25p/9wyR8NSmefhSaOE4CAcGbdpWEPPqDNdYvP1NhruVRvk0WVVTTC\n\t+2IC+TrcqbaE3WYsWZY4wPXdQB/1C+VvJDMTURIW4w4TvUlKshc2zXYEwI8mq1ANWF\n\tGwpoTijbkqkODiDlc4eDaQg5WzEkQk7gVF5NhvGA="],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"j+2UmfF1\"; dkim-atps=neutral","To":"libcamera-devel@lists.libcamera.org","Date":"Tue, 10 May 2022 14:51:39 +0300","Message-Id":"<20220510115147.19360-43-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 42/50] staging: media: imx:\n\timx7-media-csi: Drop unneeded imx7_csi_pixfmt fields","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 imx7_csi_pixfmt cycles field is never used nor set, the bayer field\nis never used, and the planar field is never set. Drop them.\n\nSigned-off-by: Laurent Pinchart \n---\n drivers/staging/media/imx/imx7-media-csi.c | 23 ++--------------------\n 1 file changed, 2 insertions(+), 21 deletions(-)","diff":"diff --git a/drivers/staging/media/imx/imx7-media-csi.c b/drivers/staging/media/imx/imx7-media-csi.c\nindex ab101d82c253..b3fa3e20873b 100644\n--- a/drivers/staging/media/imx/imx7-media-csi.c\n+++ b/drivers/staging/media/imx/imx7-media-csi.c\n@@ -185,11 +185,7 @@ struct imx7_csi_pixfmt {\n \t */\n \tconst u32 *codes;\n \tint bpp; /* total bpp */\n-\t/* cycles per pixel for generic (bayer) formats for the parallel bus */\n-\tint\tcycles;\n \tbool\tyuv;\n-\tbool planar; /* is a planar format */\n-\tbool bayer; /* is a raw bayer format */\n };\n \n struct imx7_csi_vb2_buffer {\n@@ -836,22 +832,18 @@ static const struct imx7_csi_pixfmt pixel_formats[] = {\n \t\t.fourcc = V4L2_PIX_FMT_SBGGR8,\n \t\t.codes = IMX_BUS_FMTS(MEDIA_BUS_FMT_SBGGR8_1X8),\n \t\t.bpp = 8,\n-\t\t.bayer = true,\n \t}, {\n \t\t.fourcc = V4L2_PIX_FMT_SGBRG8,\n \t\t.codes = IMX_BUS_FMTS(MEDIA_BUS_FMT_SGBRG8_1X8),\n \t\t.bpp = 8,\n-\t\t.bayer = true,\n \t}, {\n \t\t.fourcc = V4L2_PIX_FMT_SGRBG8,\n \t\t.codes = IMX_BUS_FMTS(MEDIA_BUS_FMT_SGRBG8_1X8),\n \t\t.bpp = 8,\n-\t\t.bayer = true,\n \t}, {\n \t\t.fourcc = V4L2_PIX_FMT_SRGGB8,\n \t\t.codes = IMX_BUS_FMTS(MEDIA_BUS_FMT_SRGGB8_1X8),\n \t\t.bpp = 8,\n-\t\t.bayer = true,\n \t}, {\n \t\t.fourcc = V4L2_PIX_FMT_SBGGR16,\n \t\t.codes = IMX_BUS_FMTS(\n@@ -861,7 +853,6 @@ static const struct imx7_csi_pixfmt pixel_formats[] = {\n \t\t\tMEDIA_BUS_FMT_SBGGR16_1X16\n \t\t),\n \t\t.bpp = 16,\n-\t\t.bayer = true,\n \t}, {\n \t\t.fourcc = V4L2_PIX_FMT_SGBRG16,\n \t\t.codes = IMX_BUS_FMTS(\n@@ -871,7 +862,6 @@ static const struct imx7_csi_pixfmt pixel_formats[] = {\n \t\t\tMEDIA_BUS_FMT_SGBRG16_1X16\n \t\t),\n \t\t.bpp = 16,\n-\t\t.bayer = true,\n \t}, {\n \t\t.fourcc = V4L2_PIX_FMT_SGRBG16,\n \t\t.codes = IMX_BUS_FMTS(\n@@ -881,7 +871,6 @@ static const struct imx7_csi_pixfmt pixel_formats[] = {\n \t\t\tMEDIA_BUS_FMT_SGRBG16_1X16\n \t\t),\n \t\t.bpp = 16,\n-\t\t.bayer = true,\n \t}, {\n \t\t.fourcc = V4L2_PIX_FMT_SRGGB16,\n \t\t.codes = IMX_BUS_FMTS(\n@@ -891,7 +880,6 @@ static const struct imx7_csi_pixfmt pixel_formats[] = {\n \t\t\tMEDIA_BUS_FMT_SRGGB16_1X16\n \t\t),\n \t\t.bpp = 16,\n-\t\t.bayer = true,\n \t}, {\n \t\t.fourcc = V4L2_PIX_FMT_GREY,\n \t\t.codes = IMX_BUS_FMTS(\n@@ -900,17 +888,14 @@ static const struct imx7_csi_pixfmt pixel_formats[] = {\n \t\t\tMEDIA_BUS_FMT_Y12_1X12\n \t\t),\n \t\t.bpp = 8,\n-\t\t.bayer = true,\n \t}, {\n \t\t.fourcc = V4L2_PIX_FMT_Y10,\n \t\t.codes = IMX_BUS_FMTS(MEDIA_BUS_FMT_Y10_1X10),\n \t\t.bpp = 16,\n-\t\t.bayer = true,\n \t}, {\n \t\t.fourcc = V4L2_PIX_FMT_Y12,\n \t\t.codes = IMX_BUS_FMTS(MEDIA_BUS_FMT_Y12_1X12),\n \t\t.bpp = 16,\n-\t\t.bayer = true,\n \t},\n };\n \n@@ -1087,10 +1072,7 @@ static int imx7_csi_mbus_fmt_to_pix_fmt(struct v4l2_pix_format *pix,\n \twidth = round_up(mbus->width, 8);\n \n \t/* Round up stride for IDMAC line start address alignment */\n-\tif (cc->planar)\n-\t\tstride = round_up(width, 16);\n-\telse\n-\t\tstride = round_up((width * cc->bpp) >> 3, 8);\n+\tstride = round_up((width * cc->bpp) >> 3, 8);\n \n \tpix->width = width;\n \tpix->height = mbus->height;\n@@ -1101,8 +1083,7 @@ static int imx7_csi_mbus_fmt_to_pix_fmt(struct v4l2_pix_format *pix,\n \tpix->quantization = mbus->quantization;\n \tpix->field = mbus->field;\n \tpix->bytesperline = stride;\n-\tpix->sizeimage = cc->planar ? ((stride * pix->height * cc->bpp) >> 3) :\n-\t\t\t stride * pix->height;\n+\tpix->sizeimage = stride * pix->height;\n \n \treturn 0;\n }\n","prefixes":["libcamera-devel","42/50"]}