From patchwork Tue May 10 11:51:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 15882 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id E6A23C327A for ; Tue, 10 May 2022 11:52:42 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 7901D656B4; Tue, 10 May 2022 13:52:42 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1652183562; bh=pioge0W9Z06hO1XUA2h1cbvmUn6QLKoWaFjAWPtWIa4=; h=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=jxLvCxy/EKpeDjV30bnxAxKY8ah2VONskHZVd1ZuqKkSKbSDqdJ0qgLq2YkSbOa9F 1o+RkbswFZJ//+7gXzq0WOuUsojfIyazl2ZHIObns4uiu7rLwAuTaRz41o3EZtZQE4 lnnBQLDjW+AUrsx0rgBimETDqjO8XzUvnAaCnIoFTYux/I5ojWLH4VW6kNAfuzkyfM WLiyb+QCwGH2pkvU15WaH/AmxmwwtZ6VqsgKCquHkJbN+Sez1jl4OopxWSkiKko+L0 Hh4FxczERWrsvbqgv6bxKTdrahHf65sdiWiVQ57IkOV1GYQztIjb8XBO0ytfjxiMAN Ljas8zLL4cdYg== Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 120236568E for ; Tue, 10 May 2022 13:52:32 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="j+2UmfF1"; dkim-atps=neutral Received: from pendragon.lan (62-78-145-57.bb.dnainternet.fi [62.78.145.57]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 1712CBA9; Tue, 10 May 2022 13:52:32 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1652183552; bh=pioge0W9Z06hO1XUA2h1cbvmUn6QLKoWaFjAWPtWIa4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=j+2UmfF1Qwt25p/9wyR8NSmefhSaOE4CAcGbdpWEPPqDNdYvP1NhruVRvk0WVVTTC +2IC+TrcqbaE3WYsWZY4wPXdQB/1C+VvJDMTURIW4w4TvUlKshc2zXYEwI8mq1ANWF GwpoTijbkqkODiDlc4eDaQg5WzEkQk7gVF5NhvGA= 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 Subject: [libcamera-devel] [PATCH 42/50] staging: media: imx: imx7-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: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Laurent Pinchart via libcamera-devel From: Laurent Pinchart Reply-To: Laurent Pinchart Cc: Martin Kepplinger , kernel@pengutronix.de, Dorota Czaplejewicz , Alexander Stein , Rui Miguel Silva , Philipp Zabel , Steve Longerbeam Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" The imx7_csi_pixfmt cycles field is never used nor set, the bayer field is never used, and the planar field is never set. Drop them. Signed-off-by: Laurent Pinchart --- drivers/staging/media/imx/imx7-media-csi.c | 23 ++-------------------- 1 file changed, 2 insertions(+), 21 deletions(-) diff --git a/drivers/staging/media/imx/imx7-media-csi.c b/drivers/staging/media/imx/imx7-media-csi.c index ab101d82c253..b3fa3e20873b 100644 --- a/drivers/staging/media/imx/imx7-media-csi.c +++ b/drivers/staging/media/imx/imx7-media-csi.c @@ -185,11 +185,7 @@ struct imx7_csi_pixfmt { */ const u32 *codes; int bpp; /* total bpp */ - /* cycles per pixel for generic (bayer) formats for the parallel bus */ - int cycles; bool yuv; - bool planar; /* is a planar format */ - bool bayer; /* is a raw bayer format */ }; struct imx7_csi_vb2_buffer { @@ -836,22 +832,18 @@ static const struct imx7_csi_pixfmt pixel_formats[] = { .fourcc = V4L2_PIX_FMT_SBGGR8, .codes = IMX_BUS_FMTS(MEDIA_BUS_FMT_SBGGR8_1X8), .bpp = 8, - .bayer = true, }, { .fourcc = V4L2_PIX_FMT_SGBRG8, .codes = IMX_BUS_FMTS(MEDIA_BUS_FMT_SGBRG8_1X8), .bpp = 8, - .bayer = true, }, { .fourcc = V4L2_PIX_FMT_SGRBG8, .codes = IMX_BUS_FMTS(MEDIA_BUS_FMT_SGRBG8_1X8), .bpp = 8, - .bayer = true, }, { .fourcc = V4L2_PIX_FMT_SRGGB8, .codes = IMX_BUS_FMTS(MEDIA_BUS_FMT_SRGGB8_1X8), .bpp = 8, - .bayer = true, }, { .fourcc = V4L2_PIX_FMT_SBGGR16, .codes = IMX_BUS_FMTS( @@ -861,7 +853,6 @@ static const struct imx7_csi_pixfmt pixel_formats[] = { MEDIA_BUS_FMT_SBGGR16_1X16 ), .bpp = 16, - .bayer = true, }, { .fourcc = V4L2_PIX_FMT_SGBRG16, .codes = IMX_BUS_FMTS( @@ -871,7 +862,6 @@ static const struct imx7_csi_pixfmt pixel_formats[] = { MEDIA_BUS_FMT_SGBRG16_1X16 ), .bpp = 16, - .bayer = true, }, { .fourcc = V4L2_PIX_FMT_SGRBG16, .codes = IMX_BUS_FMTS( @@ -881,7 +871,6 @@ static const struct imx7_csi_pixfmt pixel_formats[] = { MEDIA_BUS_FMT_SGRBG16_1X16 ), .bpp = 16, - .bayer = true, }, { .fourcc = V4L2_PIX_FMT_SRGGB16, .codes = IMX_BUS_FMTS( @@ -891,7 +880,6 @@ static const struct imx7_csi_pixfmt pixel_formats[] = { MEDIA_BUS_FMT_SRGGB16_1X16 ), .bpp = 16, - .bayer = true, }, { .fourcc = V4L2_PIX_FMT_GREY, .codes = IMX_BUS_FMTS( @@ -900,17 +888,14 @@ static const struct imx7_csi_pixfmt pixel_formats[] = { MEDIA_BUS_FMT_Y12_1X12 ), .bpp = 8, - .bayer = true, }, { .fourcc = V4L2_PIX_FMT_Y10, .codes = IMX_BUS_FMTS(MEDIA_BUS_FMT_Y10_1X10), .bpp = 16, - .bayer = true, }, { .fourcc = V4L2_PIX_FMT_Y12, .codes = IMX_BUS_FMTS(MEDIA_BUS_FMT_Y12_1X12), .bpp = 16, - .bayer = true, }, }; @@ -1087,10 +1072,7 @@ static int imx7_csi_mbus_fmt_to_pix_fmt(struct v4l2_pix_format *pix, width = round_up(mbus->width, 8); /* Round up stride for IDMAC line start address alignment */ - if (cc->planar) - stride = round_up(width, 16); - else - stride = round_up((width * cc->bpp) >> 3, 8); + stride = round_up((width * cc->bpp) >> 3, 8); pix->width = width; pix->height = mbus->height; @@ -1101,8 +1083,7 @@ static int imx7_csi_mbus_fmt_to_pix_fmt(struct v4l2_pix_format *pix, pix->quantization = mbus->quantization; pix->field = mbus->field; pix->bytesperline = stride; - pix->sizeimage = cc->planar ? ((stride * pix->height * cc->bpp) >> 3) : - stride * pix->height; + pix->sizeimage = stride * pix->height; return 0; }