From patchwork Fri Sep 20 12:41:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Scally X-Patchwork-Id: 829951 Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BC375152196 for ; Fri, 20 Sep 2024 12:41:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=213.167.242.64 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1726836098; cv=none; b=j1/3EwSOuRVlR5BxeHkSLEdCUD1GPf/Wdeub+zXv/U2BVh6/CvKCuexAnIkcz3Q7Grm4kICrWzOuG8j645rw28R0/FEOGrX4LYtJ2B/tx1nqMPFjb8fVivCtlc7Uo3rbGVCg5S/umTuIUmgJsC47dJnXyzcr6SErMACEvJHkqlg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1726836098; c=relaxed/simple; bh=kh7PwktiNhfgrtUlo2582Xg0C9XPwZCf5/LsUKfktLM=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Y+4648Y1RJRA/fHnPkfZxWKGhpCVj+UC4IX8sPbEYEYUCs6Kvt/cRy75pBsGG92Mqx33tCovvQa5Db6fkxMGiTh8UUU3sl8islt0ceENx1kpgnqfeC/9XOA8keuRRbpAnmd6yODrQ+dSUNVWJCWK5TtkAud5eTbjAkSI+kv57kY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ideasonboard.com; spf=pass smtp.mailfrom=ideasonboard.com; dkim=pass (1024-bit key) header.d=ideasonboard.com header.i=@ideasonboard.com header.b=lb314tsN; arc=none smtp.client-ip=213.167.242.64 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ideasonboard.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=ideasonboard.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="lb314tsN" Received: from mail.ideasonboard.com (cpc141996-chfd3-2-0-cust928.12-3.cable.virginm.net [86.13.91.161]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 70D26C8A; Fri, 20 Sep 2024 14:40:07 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1726836007; bh=kh7PwktiNhfgrtUlo2582Xg0C9XPwZCf5/LsUKfktLM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lb314tsNEcGoHh4eeX/MTIHelbr1KcAkijR7anSE4/VB98yAL3AQyc3uOpfY00w9R P5YQ7yUbWfZQqlJsHWPTJMSfstVmo880wWMSlWuy025ToQdPqdvpJmOC8E5d/eRiVG Aaa4dZ4oSGaK60eJJKiVqnkoawo7Ygv6K/bcCntI= From: Daniel Scally To: linux-media@vger.kernel.org Cc: hverkuil-cisco@xs4all.nl, sakari.ailus@linux.intel.com, laurent.pinchart@ideasonboard.com, prabhakar.mahadev-lad.rj@bp.renesas.com, Daniel Scally Subject: [PATCH 3/4] media: platform: rzg2l-cru: Use v4l2_fill_pixfmt() Date: Fri, 20 Sep 2024 13:41:14 +0100 Message-Id: <20240920124115.375748-4-dan.scally@ideasonboard.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240920124115.375748-1-dan.scally@ideasonboard.com> References: <20240920124115.375748-1-dan.scally@ideasonboard.com> Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Daniel Scally Rather than open-code a calculation of the format's bytesperline and sizeimage, use the v4l2_fill_pixfmt() helper. This makes it easier to support the CRU packed pixel formats without over complicating the driver. This change makes the .bpp member of struct rzg2l_cru_ip_format and the rzg2l_cru_ip_pix_fmt_to_bpp() function superfluous - remove them both. Signed-off-by: Daniel Scally --- .../platform/renesas/rzg2l-cru/rzg2l-cru.h | 3 --- .../platform/renesas/rzg2l-cru/rzg2l-ip.c | 16 -------------- .../platform/renesas/rzg2l-cru/rzg2l-video.c | 21 ++----------------- 3 files changed, 2 insertions(+), 38 deletions(-) diff --git a/drivers/media/platform/renesas/rzg2l-cru/rzg2l-cru.h b/drivers/media/platform/renesas/rzg2l-cru/rzg2l-cru.h index dc50a5feb3de..858098b8a13f 100644 --- a/drivers/media/platform/renesas/rzg2l-cru/rzg2l-cru.h +++ b/drivers/media/platform/renesas/rzg2l-cru/rzg2l-cru.h @@ -68,14 +68,12 @@ struct rzg2l_cru_ip { * @code: Media bus code * @format: 4CC format identifier (V4L2_PIX_FMT_*) * @datatype: MIPI CSI2 data type - * @bpp: bytes per pixel * @icndmr: ICnDMR register value */ struct rzg2l_cru_ip_format { u32 code; u32 format; u32 datatype; - u8 bpp; u32 icndmr; }; @@ -169,7 +167,6 @@ void rzg2l_cru_ip_subdev_unregister(struct rzg2l_cru_dev *cru); struct v4l2_mbus_framefmt *rzg2l_cru_ip_get_src_fmt(struct rzg2l_cru_dev *cru); const struct rzg2l_cru_ip_format *rzg2l_cru_ip_code_to_fmt(unsigned int code); -u8 rzg2l_cru_ip_pix_fmt_to_bpp(u32 format); int rzg2l_cru_ip_index_to_pix_fmt(u32 index); int rzg2l_cru_ip_pix_fmt_to_icndmr(u32 format); diff --git a/drivers/media/platform/renesas/rzg2l-cru/rzg2l-ip.c b/drivers/media/platform/renesas/rzg2l-cru/rzg2l-ip.c index 9bb192655f25..f2fea3a63444 100644 --- a/drivers/media/platform/renesas/rzg2l-cru/rzg2l-ip.c +++ b/drivers/media/platform/renesas/rzg2l-cru/rzg2l-ip.c @@ -16,35 +16,30 @@ static const struct rzg2l_cru_ip_format rzg2l_cru_ip_formats[] = { .code = MEDIA_BUS_FMT_UYVY8_1X16, .format = V4L2_PIX_FMT_UYVY, .datatype = MIPI_CSI2_DT_YUV422_8B, - .bpp = 2, .icndmr = ICnDMR_YCMODE_UYVY, }, { .code = MEDIA_BUS_FMT_SBGGR8_1X8, .format = V4L2_PIX_FMT_SBGGR8, .datatype = MIPI_CSI2_DT_RAW8, - .bpp = 1, .icndmr = 0, }, { .code = MEDIA_BUS_FMT_SGBRG8_1X8, .format = V4L2_PIX_FMT_SGBRG8, .datatype = MIPI_CSI2_DT_RAW8, - .bpp = 1, .icndmr = 0, }, { .code = MEDIA_BUS_FMT_SGRBG8_1X8, .format = V4L2_PIX_FMT_SGRBG8, .datatype = MIPI_CSI2_DT_RAW8, - .bpp = 1, .icndmr = 0, }, { .code = MEDIA_BUS_FMT_SRGGB8_1X8, .format = V4L2_PIX_FMT_SRGGB8, .datatype = MIPI_CSI2_DT_RAW8, - .bpp = 1, .icndmr = 0, }, }; @@ -60,17 +55,6 @@ const struct rzg2l_cru_ip_format *rzg2l_cru_ip_code_to_fmt(unsigned int code) return NULL; } -u8 rzg2l_cru_ip_pix_fmt_to_bpp(u32 format) -{ - unsigned int i; - - for (i = 0; i < ARRAY_SIZE(rzg2l_cru_ip_formats); i++) - if (rzg2l_cru_ip_formats[i].format == format) - return rzg2l_cru_ip_formats[i].bpp; - - return 0; -} - int rzg2l_cru_ip_index_to_pix_fmt(u32 index) { if (index >= ARRAY_SIZE(rzg2l_cru_ip_formats)) diff --git a/drivers/media/platform/renesas/rzg2l-cru/rzg2l-video.c b/drivers/media/platform/renesas/rzg2l-cru/rzg2l-video.c index 61e2f23053ee..01b39a2395df 100644 --- a/drivers/media/platform/renesas/rzg2l-cru/rzg2l-video.c +++ b/drivers/media/platform/renesas/rzg2l-cru/rzg2l-video.c @@ -800,27 +800,11 @@ int rzg2l_cru_dma_register(struct rzg2l_cru_dev *cru) * V4L2 stuff */ -static u32 rzg2l_cru_format_bytesperline(struct v4l2_pix_format *pix) -{ - u8 bpp; - - bpp = rzg2l_cru_ip_pix_fmt_to_bpp(pix->pixelformat); - - if (WARN_ON(!bpp)) - return 0; - - return pix->width * bpp; -} - -static u32 rzg2l_cru_format_sizeimage(struct v4l2_pix_format *pix) -{ - return pix->bytesperline * pix->height; -} static void rzg2l_cru_format_align(struct rzg2l_cru_dev *cru, struct v4l2_pix_format *pix) { - if (!rzg2l_cru_ip_pix_fmt_to_bpp(pix->pixelformat)) + if (rzg2l_cru_ip_pix_fmt_to_icndmr(pix->pixelformat) < 0) pix->pixelformat = RZG2L_CRU_DEFAULT_FORMAT; switch (pix->field) { @@ -840,8 +824,7 @@ static void rzg2l_cru_format_align(struct rzg2l_cru_dev *cru, v4l_bound_align_image(&pix->width, 320, RZG2L_CRU_MAX_INPUT_WIDTH, 1, &pix->height, 240, RZG2L_CRU_MAX_INPUT_HEIGHT, 2, 0); - pix->bytesperline = rzg2l_cru_format_bytesperline(pix); - pix->sizeimage = rzg2l_cru_format_sizeimage(pix); + v4l2_fill_pixfmt(pix, pix->pixelformat, pix->width, pix->height); dev_dbg(cru->dev, "Format %ux%u bpl: %u size: %u\n", pix->width, pix->height, pix->bytesperline, pix->sizeimage);