f07e572f64
bcm2708: boot tested on RPi B+ v1.2 bcm2709: boot tested on RPi 3B v1.2 and RPi 4B v1.1 4G bcm2710: boot tested on RPi 3B v1.2 bcm2711: boot tested on RPi 4B v1.1 4G Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
50 lines
1.6 KiB
Diff
50 lines
1.6 KiB
Diff
From 53d7c93a14d1e0804a96e3a21f472ba5ff033b14 Mon Sep 17 00:00:00 2001
|
|
From: Naushir Patuck <naush@raspberrypi.com>
|
|
Date: Tue, 21 Apr 2020 16:26:03 +0100
|
|
Subject: [PATCH] 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(-)
|
|
|
|
--- 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(struc
|
|
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;
|