Commit 960badda authored by Yunfei Dong's avatar Yunfei Dong Committed by Mauro Carvalho Chehab
Browse files

media: mediatek: vcodec: change lat thread decode error condition 



If lat thread can't get lat buffer, it should be that current instance
don't be schedulded, the driver can't free the src buffer directly.

Fixes: 7b182b8d ("media: mediatek: vcodec: Refactor get and put capture buffer flow")
Signed-off-by: default avatarYunfei Dong <yunfei.dong@mediatek.com>
Reviewed-by: default avatarAngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
parent 2e0ef56d

drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec_stateless.c

+4 −2
Original line number Diff line number Diff line
@@ -258,8 +258,10 @@ static void mtk_vdec_worker(struct work_struct *work) 
		if (src_buf_req)

			v4l2_ctrl_request_complete(src_buf_req, &ctx->ctrl_hdl);

	} else {

		if (ret != -EAGAIN) {

			v4l2_m2m_src_buf_remove(ctx->m2m_ctx);

			v4l2_m2m_buf_done(vb2_v4l2_src, state);

		}

		v4l2_m2m_job_finish(dev->m2m_dev_dec, ctx->m2m_ctx);

	}

}

drivers/media/platform/mediatek/vcodec/vdec/vdec_h264_req_multi_if.c

+1 −1
Original line number Diff line number Diff line
@@ -597,7 +597,7 @@ static int vdec_h264_slice_lat_decode(void *h_vdec, struct mtk_vcodec_mem *bs, 
	lat_buf = vdec_msg_queue_dqbuf(&inst->ctx->msg_queue.lat_ctx);

	if (!lat_buf) {

		mtk_vcodec_err(inst, "failed to get lat buffer");

		return -EINVAL;

		return -EAGAIN;

	}

	share_info = lat_buf->private_data;

	src_buf_info = container_of(bs, struct mtk_video_dec_buf, bs_buffer);

drivers/media/platform/mediatek/vcodec/vdec/vdec_vp9_req_lat_if.c

+1 −1
Original line number Diff line number Diff line
@@ -2070,7 +2070,7 @@ static int vdec_vp9_slice_lat_decode(void *h_vdec, struct mtk_vcodec_mem *bs, 
	lat_buf = vdec_msg_queue_dqbuf(&instance->ctx->msg_queue.lat_ctx);

	if (!lat_buf) {

		mtk_vcodec_err(instance, "Failed to get VP9 lat buf\n");

		return -EBUSY;

		return -EAGAIN;

	}

	pfc = (struct vdec_vp9_slice_pfc *)lat_buf->private_data;

	if (!pfc) {