aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/bcm27xx/patches-5.10/950-0586-staging-bcm2835-codec-Do-not-update-crop-from-S_FMT-.patch
diff options
context:
space:
mode:
Diffstat (limited to 'target/linux/bcm27xx/patches-5.10/950-0586-staging-bcm2835-codec-Do-not-update-crop-from-S_FMT-.patch')
-rw-r--r--target/linux/bcm27xx/patches-5.10/950-0586-staging-bcm2835-codec-Do-not-update-crop-from-S_FMT-.patch36
1 files changed, 36 insertions, 0 deletions
diff --git a/target/linux/bcm27xx/patches-5.10/950-0586-staging-bcm2835-codec-Do-not-update-crop-from-S_FMT-.patch b/target/linux/bcm27xx/patches-5.10/950-0586-staging-bcm2835-codec-Do-not-update-crop-from-S_FMT-.patch
new file mode 100644
index 0000000000..cace71630b
--- /dev/null
+++ b/target/linux/bcm27xx/patches-5.10/950-0586-staging-bcm2835-codec-Do-not-update-crop-from-S_FMT-.patch
@@ -0,0 +1,36 @@
+From 0409260a821dd9b8d3d8e5f4fbdee1b6f892bd4d Mon Sep 17 00:00:00 2001
+From: Dave Stevenson <dave.stevenson@raspberrypi.com>
+Date: Thu, 15 Apr 2021 11:07:55 +0100
+Subject: [PATCH] staging/bcm2835-codec: Do not update crop from S_FMT
+ after res change
+
+During decode, setting the CAPTURE queue format was setting the crop
+rectangle to the requested height before aligning up the format to
+cater for simple clients that weren't expecting to deal with cropping
+and the SELECTION API.
+This caused problems on some resolution change events if the client
+didn't also then use the selection API.
+
+Disable the crop update after a resolution change.
+
+Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
+---
+ .../vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+--- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
++++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
+@@ -999,6 +999,13 @@ static void handle_fmt_changed(struct bc
+
+ q_data->crop_width = format->es.video.crop.width;
+ q_data->crop_height = format->es.video.crop.height;
++ /*
++ * Stop S_FMT updating crop_height should it be unaligned.
++ * Client can still update the crop region via S_SELECTION should it
++ * really want to, but the decoder is likely to complain that the
++ * format then doesn't match.
++ */
++ q_data->selection_set = true;
+ q_data->bytesperline = get_bytesperline(format->es.video.width,
+ q_data->fmt);
+