brcm2708: update to latest patches from RPi Foundation

[openwrt/openwrt.git] / target / linux / brcm2708 / patches-4.19 / 950-0417-staging-bcm2835-codec-Remove-height-padding-for-ISP-.patch

diff --git a/target/linux/brcm2708/patches-4.19/950-0417-staging-bcm2835-codec-Remove-height-padding-for-ISP-.patch b/target/linux/brcm2708/patches-4.19/950-0417-staging-bcm2835-codec-Remove-height-padding-for-ISP-.patch
new file mode 100644 (file)
index 0000000..6f99736
--- /dev/null
+++ b/target/linux/brcm2708/patches-4.19/950-0417-staging-bcm2835-codec-Remove-height-padding-for-ISP-.patch
@@ -0,0 +1,61 @@
+From 52e50b0f5017e823428849c42c1029306d790939 Mon Sep 17 00:00:00 2001
+From: Dave Stevenson <dave.stevenson@raspberrypi.org>
+Date: Thu, 2 May 2019 14:32:21 +0100
+Subject: [PATCH] staging: bcm2835-codec: Remove height padding for ISP
+ role
+
+The ISP has no need for heights to be a multiple of macroblock
+sizes, therefore doesn't require the align on the height.
+Remove it for the ISP role. (It is required for the codecs).
+
+Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
+---
+ .../bcm2835-codec/bcm2835-v4l2-codec.c              | 13 ++++++++-----
+ 1 file changed, 8 insertions(+), 5 deletions(-)
+
+--- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
++++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
+@@ -1015,7 +1015,8 @@ static int vidioc_g_fmt_vid_cap(struct f
+       return vidioc_g_fmt(file2ctx(file), f);
+ }
+ 
+-static int vidioc_try_fmt(struct v4l2_format *f, struct bcm2835_codec_fmt *fmt)
++static int vidioc_try_fmt(struct bcm2835_codec_ctx *ctx, struct v4l2_format *f,
++                        struct bcm2835_codec_fmt *fmt)
+ {
+       /*
+        * The V4L2 specification requires the driver to correct the format
+@@ -1034,11 +1035,13 @@ static int vidioc_try_fmt(struct v4l2_fo
+                       f->fmt.pix.height = MIN_H;
+ 
+               /*
+-               * Buffer must have a vertical alignment of 16 lines.
++               * For codecs the buffer must have a vertical alignment of 16
++               * lines.
+                * The selection will reflect any cropping rectangle when only
+                * some of the pixels are active.
+                */
+-              f->fmt.pix.height = ALIGN(f->fmt.pix.height, 16);
++              if (ctx->dev->role != ISP)
++                      f->fmt.pix.height = ALIGN(f->fmt.pix.height, 16);
+       }
+       f->fmt.pix.bytesperline = get_bytesperline(f->fmt.pix.width,
+                                                  fmt);
+@@ -1065,7 +1068,7 @@ static int vidioc_try_fmt_vid_cap(struct
+               fmt = find_format(f, ctx->dev, true);
+       }
+ 
+-      return vidioc_try_fmt(f, fmt);
++      return vidioc_try_fmt(ctx, f, fmt);
+ }
+ 
+ static int vidioc_try_fmt_vid_out(struct file *file, void *priv,
+@@ -1084,7 +1087,7 @@ static int vidioc_try_fmt_vid_out(struct
+       if (!f->fmt.pix.colorspace)
+               f->fmt.pix.colorspace = ctx->colorspace;
+ 
+-      return vidioc_try_fmt(f, fmt);
++      return vidioc_try_fmt(ctx, f, fmt);
+ }
+ 
+ static int vidioc_s_fmt(struct bcm2835_codec_ctx *ctx, struct v4l2_format *f,