mirror of
https://github.com/torvalds/linux
synced 2024-10-17 16:58:15 +00:00
media: amphion: cancel vpu before release instance
Revert "media: amphion: release m2m ctx when releasing vpu instance" This reverts commitd91d7bc850
. Call v4l2_m2m_ctx_release() to cancel vpu, afterwards release the vpu instance. Fixes:d91d7bc850
("media: amphion: release m2m ctx when releasing vpu instance") Signed-off-by: Ming Qian <ming.qian@nxp.com> Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
This commit is contained in:
parent
082744433f
commit
b3dd974af9
|
@ -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);
|
||||
|
|
Loading…
Reference in a new issue