Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ad34f541 authored by Tiffany Lin's avatar Tiffany Lin Committed by Mauro Carvalho Chehab
Browse files

[media] vcodec:mediatek: Fix fops_vcodec_release flow for V4L2 Encoder 



This patch fix that mtk_vcodec_venc_release should be called after v4l2_m2m_ctx_release

Signed-off-by: default avatarTiffany Lin <tiffany.lin@mediatek.com>
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent 0d06108c

drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c

+6 −1
Original line number Diff line number Diff line
@@ -1288,5 +1288,10 @@ int mtk_venc_lock(struct mtk_vcodec_ctx *ctx) 


void mtk_vcodec_enc_release(struct mtk_vcodec_ctx *ctx)

{

	venc_if_deinit(ctx);

	int ret = venc_if_deinit(ctx);



	if (ret)

		mtk_v4l2_err("venc_if_deinit failed=%d", ret);



	ctx->state = MTK_STATE_FREE;

}

drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c

+5 −1
Original line number Diff line number Diff line
@@ -218,11 +218,15 @@ static int fops_vcodec_release(struct file *file) 
	mtk_v4l2_debug(1, "[%d] encoder", ctx->id);

	mutex_lock(&dev->dev_mutex);



	/*

	 * Call v4l2_m2m_ctx_release to make sure the worker thread is not

	 * running after venc_if_deinit.

	 */

	v4l2_m2m_ctx_release(ctx->m2m_ctx);

	mtk_vcodec_enc_release(ctx);

	v4l2_fh_del(&ctx->fh);

	v4l2_fh_exit(&ctx->fh);

	v4l2_ctrl_handler_free(&ctx->ctrl_hdl);

	v4l2_m2m_ctx_release(ctx->m2m_ctx);



	list_del_init(&ctx->list);

	dev->num_instances--;