diff options
Diffstat (limited to 'target/linux/bcm27xx/patches-5.15/950-0502-media-rpivid-Ensure-IRQs-have-completed-before-unini.patch')
| -rw-r--r-- | target/linux/bcm27xx/patches-5.15/950-0502-media-rpivid-Ensure-IRQs-have-completed-before-unini.patch | 100 |
1 files changed, 100 insertions, 0 deletions
diff --git a/target/linux/bcm27xx/patches-5.15/950-0502-media-rpivid-Ensure-IRQs-have-completed-before-unini.patch b/target/linux/bcm27xx/patches-5.15/950-0502-media-rpivid-Ensure-IRQs-have-completed-before-unini.patch new file mode 100644 index 0000000000..25081e269b --- /dev/null +++ b/target/linux/bcm27xx/patches-5.15/950-0502-media-rpivid-Ensure-IRQs-have-completed-before-unini.patch @@ -0,0 +1,100 @@ +From de6caac0f49de31d79b487ac1a998f0cfafdd5af Mon Sep 17 00:00:00 2001 +From: John Cox <jc@kynesim.co.uk> +Date: Wed, 22 Sep 2021 19:05:30 +0100 +Subject: [PATCH] media: rpivid: Ensure IRQs have completed before + uniniting context + +Before uniniting the decode context sync with the IRQ queues to ensure +that decode no longer has any buffers in use. This fixes a problem that +manifested as ffmpeg leaking CMA buffers when it did a stream off on +OUTPUT before CAPTURE, though in reality it was probably much more +dangerous than that. + +Signed-off-by: John Cox <jc@kynesim.co.uk> +--- + drivers/staging/media/rpivid/rpivid_h265.c | 58 ++++++++++++++++++++-- + 1 file changed, 53 insertions(+), 5 deletions(-) + +--- a/drivers/staging/media/rpivid/rpivid_h265.c ++++ b/drivers/staging/media/rpivid/rpivid_h265.c +@@ -2387,12 +2387,50 @@ static void dec_state_delete(struct rpiv + kfree(s); + } + +-static void rpivid_h265_stop(struct rpivid_ctx *ctx) ++struct irq_sync { ++ atomic_t done; ++ wait_queue_head_t wq; ++ struct rpivid_hw_irq_ent irq_ent; ++}; ++ ++static void phase2_sync_claimed(struct rpivid_dev *const dev, void *v) + { +- struct rpivid_dev *const dev = ctx->dev; +- unsigned int i; ++ struct irq_sync *const sync = v; + +- v4l2_info(&dev->v4l2_dev, "%s\n", __func__); ++ atomic_set(&sync->done, 1); ++ wake_up(&sync->wq); ++} ++ ++static void phase1_sync_claimed(struct rpivid_dev *const dev, void *v) ++{ ++ struct irq_sync *const sync = v; ++ ++ rpivid_hw_irq_active1_enable_claim(dev, 1); ++ rpivid_hw_irq_active2_claim(dev, &sync->irq_ent, phase2_sync_claimed, sync); ++} ++ ++/* Sync with IRQ operations ++ * ++ * Claims phase1 and phase2 in turn and waits for the phase2 claim so any ++ * pending IRQ ops will have completed by the time this returns ++ * ++ * phase1 has counted enables so must reenable once claimed ++ * phase2 has unlimited enables ++ */ ++static void irq_sync(struct rpivid_dev *const dev) ++{ ++ struct irq_sync sync; ++ ++ atomic_set(&sync.done, 0); ++ init_waitqueue_head(&sync.wq); ++ ++ rpivid_hw_irq_active1_claim(dev, &sync.irq_ent, phase1_sync_claimed, &sync); ++ wait_event(sync.wq, atomic_read(&sync.done)); ++} ++ ++static void h265_ctx_uninit(struct rpivid_dev *const dev, struct rpivid_ctx *ctx) ++{ ++ unsigned int i; + + dec_env_uninit(ctx); + dec_state_delete(ctx); +@@ -2409,6 +2447,16 @@ static void rpivid_h265_stop(struct rpiv + gptr_free(dev, ctx->coeff_bufs + i); + } + ++static void rpivid_h265_stop(struct rpivid_ctx *ctx) ++{ ++ struct rpivid_dev *const dev = ctx->dev; ++ ++ v4l2_info(&dev->v4l2_dev, "%s\n", __func__); ++ ++ irq_sync(dev); ++ h265_ctx_uninit(dev, ctx); ++} ++ + static int rpivid_h265_start(struct rpivid_ctx *ctx) + { + struct rpivid_dev *const dev = ctx->dev; +@@ -2470,7 +2518,7 @@ static int rpivid_h265_start(struct rpiv + return 0; + + fail: +- rpivid_h265_stop(ctx); ++ h265_ctx_uninit(dev, ctx); + return -ENOMEM; + } + |