mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-27 01:11:14 +00:00
793f8ab62c
Add kernel patches for version 6.1. Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
65 lines
2.1 KiB
Diff
65 lines
2.1 KiB
Diff
From f46108f6b967602e60505ae0198709467668dc83 Mon Sep 17 00:00:00 2001
|
|
From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
|
|
Date: Sun, 16 Oct 2022 09:15:21 +0300
|
|
Subject: [PATCH] media: i2c: imx290: Factor out format retrieval to
|
|
separate function
|
|
|
|
Upstream commit b25537efeea9
|
|
|
|
The driver duplicates the same pattern to access the try or active
|
|
format in multiple locations. Factor it out to a separate function.
|
|
|
|
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
|
|
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
|
|
---
|
|
drivers/media/i2c/imx290.c | 24 ++++++++++++++----------
|
|
1 file changed, 14 insertions(+), 10 deletions(-)
|
|
|
|
--- a/drivers/media/i2c/imx290.c
|
|
+++ b/drivers/media/i2c/imx290.c
|
|
@@ -519,6 +519,16 @@ static const struct v4l2_ctrl_ops imx290
|
|
.s_ctrl = imx290_set_ctrl,
|
|
};
|
|
|
|
+static struct v4l2_mbus_framefmt *
|
|
+imx290_get_pad_format(struct imx290 *imx290, struct v4l2_subdev_state *state,
|
|
+ u32 which)
|
|
+{
|
|
+ if (which == V4L2_SUBDEV_FORMAT_ACTIVE)
|
|
+ return &imx290->current_format;
|
|
+ else
|
|
+ return v4l2_subdev_get_try_format(&imx290->sd, state, 0);
|
|
+}
|
|
+
|
|
static int imx290_enum_mbus_code(struct v4l2_subdev *sd,
|
|
struct v4l2_subdev_state *sd_state,
|
|
struct v4l2_subdev_mbus_code_enum *code)
|
|
@@ -562,12 +572,7 @@ static int imx290_get_fmt(struct v4l2_su
|
|
|
|
mutex_lock(&imx290->lock);
|
|
|
|
- if (fmt->which == V4L2_SUBDEV_FORMAT_TRY)
|
|
- framefmt = v4l2_subdev_get_try_format(&imx290->sd, sd_state,
|
|
- fmt->pad);
|
|
- else
|
|
- framefmt = &imx290->current_format;
|
|
-
|
|
+ framefmt = imx290_get_pad_format(imx290, sd_state, fmt->which);
|
|
fmt->format = *framefmt;
|
|
|
|
mutex_unlock(&imx290->lock);
|
|
@@ -627,10 +632,9 @@ static int imx290_set_fmt(struct v4l2_su
|
|
fmt->format.code = imx290_formats[i].code;
|
|
fmt->format.field = V4L2_FIELD_NONE;
|
|
|
|
- if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
|
|
- format = v4l2_subdev_get_try_format(sd, sd_state, fmt->pad);
|
|
- } else {
|
|
- format = &imx290->current_format;
|
|
+ format = imx290_get_pad_format(imx290, sd_state, fmt->which);
|
|
+
|
|
+ if (fmt->which == V4L2_SUBDEV_FORMAT_ACTIVE) {
|
|
imx290->current_mode = mode;
|
|
imx290->bpp = imx290_formats[i].bpp;
|
|
|