media: amphion: cancel vpu before release instance
Subsystems (2)
Ming Qian
maintainerPATCH 1/1 media: amphion: cancel vpu before release instance
Revert "media: amphion: release m2m ctx when releasing vpu instance" This reverts commit d91d7bc85062309aae6d8064563ddf17947cb6bc.
Call v4l2_m2m_ctx_release() to cancel vpu,
afterwards release the vpu instance.
Fixes d91d7bc85062 ("media: amphion: release m2m ctx when releasing vpu instance")
Signed-off-by Ming Qian <[email protected]>
--- drivers/media/platform/amphion/vpu_v4l2.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
drivers/media/platform/amphion/vpu_v4l2.c +7 -4
@@ -681,10 +681,6 @@ static int vpu_v4l2_release(struct vpu_inst *inst) inst->workqueue =NULL ; } -if (inst->fh.m2m_ctx) { -v4l2_m2m_ctx_release (inst->fh.m2m_ctx); - inst->fh.m2m_ctx =NULL ; - }v4l2_ctrl_handler_free (&inst->ctrl_handler);mutex_destroy (&inst->lock);v4l2_fh_del (&inst->fh);
@@ -767,6 +763,13 @@ int vpu_v4l2_close(struct file *file)vpu_trace (vpu->dev,"tgid = %d, pid = %d, inst = %p\n" , inst->tgid, inst->pid, inst); +vpu_inst_lock (inst); +if (inst->fh.m2m_ctx) { +v4l2_m2m_ctx_release (inst->fh.m2m_ctx); + inst->fh.m2m_ctx =NULL ; + } +vpu_inst_unlock (inst); +call_void_vop (inst, release);vpu_inst_unregister (inst);vpu_inst_put (inst);
Signature · 1 line
2.38.1