diff options
| author | Stanimir Varbanov <stanimir.varbanov@linaro.org> | 2020-04-18 12:06:22 +0300 |
|---|---|---|
| committer | Stanimir Varbanov <stanimir.varbanov@linaro.org> | 2020-04-25 16:25:28 +0300 |
| commit | e95173a155cdb60a01b03d88f7b0c38f069e2dd0 (patch) | |
| tree | ff1a70b44e53fc68139231b3636798d7a41e6fe0 | |
| parent | 5ceee89ff1c9daa0702cabb7b53d7c6447ffa10a (diff) | |
venus: venc,vdec: Return EBUSY on S_FMT while streamingvenus-tag-for-v5.8-part2venus-for-next-v5.8-part2
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: Stanimir Varbanov <stanimir.varbanov@linaro.org>
| -rw-r--r-- | drivers/media/platform/qcom/venus/vdec.c | 8 | ||||
| -rw-r--r-- | drivers/media/platform/qcom/venus/venc.c | 8 |
2 files changed, 16 insertions, 0 deletions
diff --git a/drivers/media/platform/qcom/venus/vdec.c b/drivers/media/platform/qcom/venus/vdec.c index 527944c822b5..7c4c483d5438 100644 --- a/drivers/media/platform/qcom/venus/vdec.c +++ b/drivers/media/platform/qcom/venus/vdec.c @@ -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; diff --git a/drivers/media/platform/qcom/venus/venc.c b/drivers/media/platform/qcom/venus/venc.c index 3d8431dc14c4..feed648550d1 100644 --- a/drivers/media/platform/qcom/venus/venc.c +++ b/drivers/media/platform/qcom/venus/venc.c @@ -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; |