raspi/linux
1
0
Fork 1
mirror of https://github.com/raspberrypi/linux.git synced 2025-12-07 02:19:54 +00:00
Code Issues Projects Releases Wiki Activity

media: rpivid: Ensure IRQs have completed before uniniting context

Browse Source 
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>
This commit is contained in:
John Cox
2021-09-22 19:05:30 +01:00
committed by Dom Cobley
parent 5233dc331e
commit 1774a95d9c
1 changed files with 54 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
drivers/staging/media/rpivid/rpivid_h265.c
View File

@@ -2387,12 +2387,50 @@ static void dec_state_delete(struct rpivid_ctx *const ctx)
kfree(s); kfree(s);
} }
static void rpivid_h265_stop(struct rpivid_ctx *ctx) struct irq_sync {
{ atomic_t done;
struct rpivid_dev *const dev = ctx->dev; wait_queue_head_t wq;
unsigned int i; struct rpivid_hw_irq_ent irq_ent;
};
v4l2_info(&dev->v4l2_dev, "%s\n", __func__); static void phase2_sync_claimed(struct rpivid_dev *const dev, void *v)
{
struct irq_sync *const sync = v;
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_env_uninit(ctx);
dec_state_delete(ctx); dec_state_delete(ctx);
@@ -2409,6 +2447,16 @@ static void rpivid_h265_stop(struct rpivid_ctx *ctx)
gptr_free(dev, ctx->coeff_bufs + i); 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) static int rpivid_h265_start(struct rpivid_ctx *ctx)
{ {
struct rpivid_dev *const dev = ctx->dev; struct rpivid_dev *const dev = ctx->dev;
@@ -2470,7 +2518,7 @@ static int rpivid_h265_start(struct rpivid_ctx *ctx)
return 0; return 0;
fail: fail:
rpivid_h265_stop(ctx); h265_ctx_uninit(dev, ctx);
return -ENOMEM; return -ENOMEM;
} }