TWxSoftware/twx-linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

media: venus: fix enc/dec destruction order

Browse Source 
We destroy mutex-es too early as they are still taken in
v4l2_fh_exit()->v4l2_event_unsubscribe()->v4l2_ctrl_find().

We should destroy mutex-es right before kfree().  Also
do not vdec_ctrl_deinit() before v4l2_fh_exit().

Fixes: 7472c1c691 ("[media] media: venus: vdec: add video decoder files")
Suggested-by: Tomasz Figa <tfiga@google.com>
Signed-off-by: Sergey Senozhatsky <senozhatsky@chromium.org>
Reviewed-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
Signed-off-by: Stanimir Varbanov <stanimir.k.varbanov@gmail.com>
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
This commit is contained in:
Sergey Senozhatsky
2024-10-26 01:56:41 +09:00
committed by Hans Verkuil
parent 0e1d123edf
commit 6c9934c5a0
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/media/platform/qcom/venus/vdec.c
+4 -3
View File
@@ -1750,13 +1750,14 @@ static int vdec_close(struct file *file)
cancel_work_sync(&inst->delayed_process_work); cancel_work_sync(&inst->delayed_process_work);
v4l2_m2m_ctx_release(inst->m2m_ctx); v4l2_m2m_ctx_release(inst->m2m_ctx);
v4l2_m2m_release(inst->m2m_dev); v4l2_m2m_release(inst->m2m_dev);
vdec_ctrl_deinit(inst);
ida_destroy(&inst->dpb_ids); ida_destroy(&inst->dpb_ids);
hfi_session_destroy(inst); hfi_session_destroy(inst);
mutex_destroy(&inst->lock);
mutex_destroy(&inst->ctx_q_lock);
v4l2_fh_del(&inst->fh); v4l2_fh_del(&inst->fh);
v4l2_fh_exit(&inst->fh); v4l2_fh_exit(&inst->fh);
vdec_ctrl_deinit(inst);
mutex_destroy(&inst->lock);
mutex_destroy(&inst->ctx_q_lock);
vdec_pm_put(inst, false); vdec_pm_put(inst, false);
drivers/media/platform/qcom/venus/venc.c
+3 -3
View File
@@ -1542,14 +1542,14 @@ static int venc_close(struct file *file)
v4l2_m2m_ctx_release(inst->m2m_ctx); v4l2_m2m_ctx_release(inst->m2m_ctx);
v4l2_m2m_release(inst->m2m_dev); v4l2_m2m_release(inst->m2m_dev);
venc_ctrl_deinit(inst);
hfi_session_destroy(inst); hfi_session_destroy(inst);
mutex_destroy(&inst->lock);
mutex_destroy(&inst->ctx_q_lock);
v4l2_fh_del(&inst->fh); v4l2_fh_del(&inst->fh);
v4l2_fh_exit(&inst->fh); v4l2_fh_exit(&inst->fh);
venc_ctrl_deinit(inst);
inst->enc_state = VENUS_ENC_STATE_DEINIT; inst->enc_state = VENUS_ENC_STATE_DEINIT;
mutex_destroy(&inst->lock);
mutex_destroy(&inst->ctx_q_lock);
venc_pm_put(inst, false); venc_pm_put(inst, false);