diff options
author | Álvaro Fernández Rojas <noltari@gmail.com> | 2021-02-18 18:04:33 +0100 |
---|---|---|
committer | Álvaro Fernández Rojas <noltari@gmail.com> | 2021-02-18 23:42:32 +0100 |
commit | f07e572f6447465d8938679533d604e402b0f066 (patch) | |
tree | cb333bd2a67e59e7c07659514850a0fd55fc825e /target/linux/bcm27xx/patches-5.4/950-0674-media-bcm2835-unicam-Re-fetch-mbus-code-from-subdev-.patch | |
parent | 5d3a6fd970619dfc55f8259035c3027d7613a2a6 (diff) | |
download | upstream-f07e572f6447465d8938679533d604e402b0f066.tar.gz upstream-f07e572f6447465d8938679533d604e402b0f066.tar.bz2 upstream-f07e572f6447465d8938679533d604e402b0f066.zip |
bcm27xx: import latest patches from the RPi foundation
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>
Diffstat (limited to 'target/linux/bcm27xx/patches-5.4/950-0674-media-bcm2835-unicam-Re-fetch-mbus-code-from-subdev-.patch')
-rw-r--r-- | target/linux/bcm27xx/patches-5.4/950-0674-media-bcm2835-unicam-Re-fetch-mbus-code-from-subdev-.patch | 49 |
1 files changed, 0 insertions, 49 deletions
diff --git a/target/linux/bcm27xx/patches-5.4/950-0674-media-bcm2835-unicam-Re-fetch-mbus-code-from-subdev-.patch b/target/linux/bcm27xx/patches-5.4/950-0674-media-bcm2835-unicam-Re-fetch-mbus-code-from-subdev-.patch deleted file mode 100644 index 4d43c97e56..0000000000 --- a/target/linux/bcm27xx/patches-5.4/950-0674-media-bcm2835-unicam-Re-fetch-mbus-code-from-subdev-.patch +++ /dev/null @@ -1,49 +0,0 @@ -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; |