Commit 9dacde5e authored by Paul Kocialkowski's avatar Paul Kocialkowski Committed by Mauro Carvalho Chehab

media: cedrus: Forbid setting new formats on busy queues

Check that our queues are not busy before setting the format or return
EBUSY if that's the case. This ensures that our format can't change
once buffers are allocated for the queue.
Signed-off-by: default avatarPaul Kocialkowski <paul.kocialkowski@bootlin.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent ffaec3b2
...@@ -282,8 +282,13 @@ static int cedrus_s_fmt_vid_cap(struct file *file, void *priv, ...@@ -282,8 +282,13 @@ static int cedrus_s_fmt_vid_cap(struct file *file, void *priv,
{ {
struct cedrus_ctx *ctx = cedrus_file2ctx(file); struct cedrus_ctx *ctx = cedrus_file2ctx(file);
struct cedrus_dev *dev = ctx->dev; struct cedrus_dev *dev = ctx->dev;
struct vb2_queue *vq;
int ret; int ret;
vq = v4l2_m2m_get_vq(ctx->fh.m2m_ctx, f->type);
if (vb2_is_busy(vq))
return -EBUSY;
ret = cedrus_try_fmt_vid_cap(file, priv, f); ret = cedrus_try_fmt_vid_cap(file, priv, f);
if (ret) if (ret)
return ret; return ret;
...@@ -299,8 +304,13 @@ static int cedrus_s_fmt_vid_out(struct file *file, void *priv, ...@@ -299,8 +304,13 @@ static int cedrus_s_fmt_vid_out(struct file *file, void *priv,
struct v4l2_format *f) struct v4l2_format *f)
{ {
struct cedrus_ctx *ctx = cedrus_file2ctx(file); struct cedrus_ctx *ctx = cedrus_file2ctx(file);
struct vb2_queue *vq;
int ret; int ret;
vq = v4l2_m2m_get_vq(ctx->fh.m2m_ctx, f->type);
if (vb2_is_busy(vq))
return -EBUSY;
ret = cedrus_try_fmt_vid_out(file, priv, f); ret = cedrus_try_fmt_vid_out(file, priv, f);
if (ret) if (ret)
return ret; return ret;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment