mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
synced 2025-01-15 13:15:57 +00:00
media: venus: destroy hfi session after m2m_ctx release
This partially reverts commit that made hfi_session_destroy() the first step of vdec/venc close(). The reason being is a regression report when, supposedly, encode/decoder is closed with still active streaming (no ->stop_streaming() call before close()) and pending pkts, so isr_thread cannot find instance and fails to process those pending pkts. This was the idea behind the original patch - make it impossible to use instance under destruction, because this is racy, but apparently there are uses cases that depend on that unsafe pattern. Return to the old (unsafe) behaviour for the time being (until a better fix is found). Fixes: 45b1a1b348ec ("media: venus: sync with threaded IRQ during inst destruction") Cc: stable@vger.kernel.org Reported-by: Nathan Hebert <nhebert@google.com> Signed-off-by: Sergey Senozhatsky <senozhatsky@chromium.org> Signed-off-by: Stanimir Varbanov <stanimir.k.varbanov@gmail.com> Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
This commit is contained in:
parent
ab2fd4a0ca
commit
df4ff47448
@ -506,18 +506,14 @@ err_cpucfg_path:
|
||||
void venus_close_common(struct venus_inst *inst)
|
||||
{
|
||||
/*
|
||||
* First, remove the inst from the ->instances list, so that
|
||||
* to_instance() will return NULL.
|
||||
*/
|
||||
hfi_session_destroy(inst);
|
||||
/*
|
||||
* Second, make sure we don't have IRQ/IRQ-thread currently running
|
||||
* Make sure we don't have IRQ/IRQ-thread currently running
|
||||
* or pending execution, which would race with the inst destruction.
|
||||
*/
|
||||
synchronize_irq(inst->core->irq);
|
||||
|
||||
v4l2_m2m_ctx_release(inst->m2m_ctx);
|
||||
v4l2_m2m_release(inst->m2m_dev);
|
||||
hfi_session_destroy(inst);
|
||||
v4l2_fh_del(&inst->fh);
|
||||
v4l2_fh_exit(&inst->fh);
|
||||
v4l2_ctrl_handler_free(&inst->ctrl_handler);
|
||||
|
Loading…
x
Reference in New Issue
Block a user