mirror of
https://github.com/Ysurac/openmptcprouter.git
synced 2025-02-15 04:42:02 +00:00
54 lines
1.8 KiB
Diff
54 lines
1.8 KiB
Diff
From 531ef4302715da225d4a392fcc0d8e03c564273a Mon Sep 17 00:00:00 2001
|
|
From: Naushir Patuck <naush@raspberrypi.com>
|
|
Date: Tue, 21 Apr 2020 16:26:03 +0100
|
|
Subject: [PATCH 204/552] media: bcm2835-unicam: Re-fetch mbus code from subdev
|
|
on a g_fmt call
|
|
|
|
The sensor subdevice may change the Bayer order if a H/V flip is
|
|
requested after a s_fmt call. Unicam g_fmt must call the subdev get_fmt
|
|
in case this has happened and return out the correct format 4cc.
|
|
|
|
Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
|
|
---
|
|
.../media/platform/bcm2835/bcm2835-unicam.c | 21 ++++++++++++++++++-
|
|
1 file changed, 20 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/drivers/media/platform/bcm2835/bcm2835-unicam.c b/drivers/media/platform/bcm2835/bcm2835-unicam.c
|
|
index 21d3a8585118..d4684fb2797f 100644
|
|
--- a/drivers/media/platform/bcm2835/bcm2835-unicam.c
|
|
+++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c
|
|
@@ -967,11 +967,30 @@ static int unicam_enum_fmt_vid_cap(struct file *file, void *priv,
|
|
static int unicam_g_fmt_vid_cap(struct file *file, void *priv,
|
|
struct v4l2_format *f)
|
|
{
|
|
+ struct v4l2_mbus_framefmt mbus_fmt = {0};
|
|
struct unicam_node *node = video_drvdata(file);
|
|
+ struct unicam_device *dev = node->dev;
|
|
+ const struct unicam_fmt *fmt = NULL;
|
|
+ int ret;
|
|
|
|
- if (node->pad_id == METADATA_PAD)
|
|
+ if (node->pad_id != IMAGE_PAD)
|
|
+ return -EINVAL;
|
|
+
|
|
+ /*
|
|
+ * If a flip has occurred in the sensor, the fmt code might have
|
|
+ * changed. So we will need to re-fetch the format from the subdevice.
|
|
+ */
|
|
+ ret = __subdev_get_format(dev, &mbus_fmt, node->pad_id);
|
|
+ if (ret)
|
|
return -EINVAL;
|
|
|
|
+ /* Find the V4L2 format from mbus code. We must match a known format. */
|
|
+ fmt = find_format_by_code(mbus_fmt.code);
|
|
+ if (!fmt)
|
|
+ return -EINVAL;
|
|
+
|
|
+ node->fmt = fmt;
|
|
+ node->v_fmt.fmt.pix.pixelformat = fmt->fourcc;
|
|
*f = node->v_fmt;
|
|
|
|
return 0;
|
|
--
|
|
2.33.0
|
|
|