Commit 547629f7 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

media: venus: add missing wait_prepare/finish ops 



Without these ops the v4l2-compliance blocking wait test will fail.
These ops are required to ensure that when VIDIOC_DQBUF has to
wait for buffers to arrive, the queue lock is correctly released
and retaken. Otherwise the wait for a buffer would block all other
queue ioctls.

Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Cc: Stanimir Varbanov <stanimir.k.varbanov@gmail.com>
Reviewed-by: default avatarDikshita Agarwal <quic_dikshita@quicinc.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent 5e535920

drivers/media/platform/qcom/venus/vdec.c

+2 −0
Original line number Diff line number Diff line
@@ -1390,6 +1390,8 @@ static const struct vb2_ops vdec_vb2_ops = { 
	.buf_prepare = venus_helper_vb2_buf_prepare,

	.start_streaming = vdec_start_streaming,

	.stop_streaming = vdec_stop_streaming,

	.wait_prepare = vb2_ops_wait_prepare,

	.wait_finish = vb2_ops_wait_finish,

	.buf_queue = vdec_vb2_buf_queue,

};

drivers/media/platform/qcom/venus/venc.c

+2 −0
Original line number Diff line number Diff line
@@ -1319,6 +1319,8 @@ static const struct vb2_ops venc_vb2_ops = { 
	.buf_prepare = venus_helper_vb2_buf_prepare,

	.start_streaming = venc_start_streaming,

	.stop_streaming = venus_helper_vb2_stop_streaming,

	.wait_prepare = vb2_ops_wait_prepare,

	.wait_finish = vb2_ops_wait_finish,

	.buf_queue = venc_vb2_buf_queue,

};