diff options
Diffstat (limited to 'target/linux/bcm27xx/patches-5.4/950-0975-staging-bcm2835-codec-Use-a-define-the-completion-ti.patch')
| -rw-r--r-- | target/linux/bcm27xx/patches-5.4/950-0975-staging-bcm2835-codec-Use-a-define-the-completion-ti.patch | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/target/linux/bcm27xx/patches-5.4/950-0975-staging-bcm2835-codec-Use-a-define-the-completion-ti.patch b/target/linux/bcm27xx/patches-5.4/950-0975-staging-bcm2835-codec-Use-a-define-the-completion-ti.patch new file mode 100644 index 0000000000..f85baf297c --- /dev/null +++ b/target/linux/bcm27xx/patches-5.4/950-0975-staging-bcm2835-codec-Use-a-define-the-completion-ti.patch @@ -0,0 +1,35 @@ +From 7ad713e695d67b78b3cb69927d099a29593444b1 Mon Sep 17 00:00:00 2001 +From: Dave Stevenson <dave.stevenson@raspberrypi.com> +Date: Wed, 30 Sep 2020 12:12:32 +0100 +Subject: [PATCH] staging: bcm2835-codec: Use a define the completion + timeout + +Hiding a use of "HZ" as a timeout is a little nasty. + +Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com> +--- + .../vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +--- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c ++++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c +@@ -89,6 +89,9 @@ static const char * const components[] = + "ril.isp", + }; + ++/* Timeout for stop_streaming to allow all buffers to return */ ++#define COMPLETE_TIMEOUT (2 * HZ) ++ + #define MIN_W 32 + #define MIN_H 32 + #define MAX_W 1920 +@@ -2366,7 +2369,8 @@ static void bcm2835_codec_stop_streaming + while (atomic_read(&port->buffers_with_vpu)) { + v4l2_dbg(1, debug, &ctx->dev->v4l2_dev, "%s: Waiting for buffers to be returned - %d outstanding\n", + __func__, atomic_read(&port->buffers_with_vpu)); +- ret = wait_for_completion_timeout(&ctx->frame_cmplt, HZ); ++ ret = wait_for_completion_timeout(&ctx->frame_cmplt, ++ COMPLETE_TIMEOUT); + if (ret <= 0) { + v4l2_err(&ctx->dev->v4l2_dev, "%s: Timeout waiting for buffers to be returned - %d outstanding\n", + __func__, |