[PATCH v2 1/3] media: imx: imx7-media-csi: Get rid of superfluous call to imx7_csi_mbus_fmt_to_pix_fmt

Alexander Stein alexander.stein at ew.tq-group.com
Tue Apr 18 00:14:37 PDT 2023


There is no need to convert input pixformat to mbus_framefmt and back
again. Instead apply pixformat width contrains directly.

Signed-off-by: Alexander Stein <alexander.stein at ew.tq-group.com>
---
 drivers/media/platform/nxp/imx7-media-csi.c | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/drivers/media/platform/nxp/imx7-media-csi.c b/drivers/media/platform/nxp/imx7-media-csi.c
index b701e823436a8..bd649fd9166fd 100644
--- a/drivers/media/platform/nxp/imx7-media-csi.c
+++ b/drivers/media/platform/nxp/imx7-media-csi.c
@@ -1145,8 +1145,8 @@ static const struct imx7_csi_pixfmt *
 __imx7_csi_video_try_fmt(struct v4l2_pix_format *pixfmt,
 			 struct v4l2_rect *compose)
 {
-	struct v4l2_mbus_framefmt fmt_src;
 	const struct imx7_csi_pixfmt *cc;
+	u32 stride;
 
 	/*
 	 * Find the pixel format, default to the first supported format if not
@@ -1172,12 +1172,16 @@ __imx7_csi_video_try_fmt(struct v4l2_pix_format *pixfmt,
 		}
 	}
 
-	v4l2_fill_mbus_format(&fmt_src, pixfmt, 0);
-	imx7_csi_mbus_fmt_to_pix_fmt(pixfmt, &fmt_src, cc);
+	v4l_bound_align_image(&pixfmt->width, 1, 0xffff, 8,
+			      &pixfmt->height, 1, 0xffff, 1, 0);
+
+	stride = round_up((pixfmt->width * cc->bpp) / 8, 8);
+	pixfmt->bytesperline = stride;
+	pixfmt->sizeimage = stride * pixfmt->height;
 
 	if (compose) {
-		compose->width = fmt_src.width;
-		compose->height = fmt_src.height;
+		compose->width = pixfmt->width;
+		compose->height = pixfmt->height;
 	}
 
 	return cc;
-- 
2.34.1




More information about the linux-arm-kernel mailing list