Commit 4470ff69 authored by Stanimir Varbanov's avatar Stanimir Varbanov Committed by Mauro Carvalho Chehab
Browse files

media: venus: venc,vdec: Return EBUSY on S_FMT while streaming 



According to the v4l spec s_fmt must return EBUSY while the
particular queue is streaming. Add such check in encoder and
decoder s_fmt methods.

Signed-off-by: default avatarStanimir Varbanov <stanimir.varbanov@linaro.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent 85872f86

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

+8 −0
Original line number Diff line number Diff line
@@ -276,6 +276,14 @@ static int vdec_s_fmt(struct file *file, void *fh, struct v4l2_format *f) 
	const struct venus_format *fmt;

	struct v4l2_format format;

	u32 pixfmt_out = 0, pixfmt_cap = 0;

	struct vb2_queue *q;



	q = v4l2_m2m_get_vq(inst->m2m_ctx, f->type);

	if (!q)

		return -EINVAL;



	if (vb2_is_busy(q))

		return -EBUSY;



	orig_pixmp = *pixmp;

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

+8 −0
Original line number Diff line number Diff line
@@ -357,6 +357,14 @@ static int venc_s_fmt(struct file *file, void *fh, struct v4l2_format *f) 
	const struct venus_format *fmt;

	struct v4l2_format format;

	u32 pixfmt_out = 0, pixfmt_cap = 0;

	struct vb2_queue *q;



	q = v4l2_m2m_get_vq(inst->m2m_ctx, f->type);

	if (!q)

		return -EINVAL;



	if (vb2_is_busy(q))

		return -EBUSY;



	orig_pixmp = *pixmp;