diff options
author | Álvaro Fernández Rojas <noltari@gmail.com> | 2022-05-16 23:40:32 +0200 |
---|---|---|
committer | Álvaro Fernández Rojas <noltari@gmail.com> | 2022-05-17 15:11:22 +0200 |
commit | 20ea6adbf199097c4f5f591ffee088340630dae4 (patch) | |
tree | d6719d95e136611a1c25bbf7789652d6d402779d /target/linux/bcm27xx/patches-5.15/950-0387-staging-bcm2835-codec-Do-not-update-crop-from-S_FMT-.patch | |
parent | bca05bd072180dc38ef740b37ded9572a6db1981 (diff) | |
download | upstream-20ea6adbf199097c4f5f591ffee088340630dae4.tar.gz upstream-20ea6adbf199097c4f5f591ffee088340630dae4.tar.bz2 upstream-20ea6adbf199097c4f5f591ffee088340630dae4.zip |
bcm27xx: add support for linux v5.15
Build system: x86_64
Build-tested: bcm2708, bcm2709, bcm2710, bcm2711
Run-tested: bcm2708/RPiB+, bcm2709/RPi3B, bcm2710/RPi3B, bcm2711/RPi4B
Signed-off-by: Marty Jones <mj8263788@gmail.com>
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
Diffstat (limited to 'target/linux/bcm27xx/patches-5.15/950-0387-staging-bcm2835-codec-Do-not-update-crop-from-S_FMT-.patch')
-rw-r--r-- | target/linux/bcm27xx/patches-5.15/950-0387-staging-bcm2835-codec-Do-not-update-crop-from-S_FMT-.patch | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/target/linux/bcm27xx/patches-5.15/950-0387-staging-bcm2835-codec-Do-not-update-crop-from-S_FMT-.patch b/target/linux/bcm27xx/patches-5.15/950-0387-staging-bcm2835-codec-Do-not-update-crop-from-S_FMT-.patch new file mode 100644 index 0000000000..c87ca955ba --- /dev/null +++ b/target/linux/bcm27xx/patches-5.15/950-0387-staging-bcm2835-codec-Do-not-update-crop-from-S_FMT-.patch @@ -0,0 +1,36 @@ +From 9a7b20e4a376a2cccb2fb8d3e87eb4358c17d2e8 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); + |