[media] s5p-mfc: fix state check from encoder queue_setup
MFCINST_GOT_INST state is set to encoder context with set_format only for capture buffer. In queue_setup of encoder called during reqbufs, it is checked MFCINST_GOT_INST state for both capture and output buffer. So this patch fixes encoder to check MFCINST_GOT_INST state only for capture buffer from queue_setup. Signed-off-by: Seung-Woo Kim <sw0312.kim@samsung.com> Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
This commit is contained in:
parent
4f50efadcb
commit
d44da04682
|
@ -1819,11 +1819,12 @@ static int s5p_mfc_queue_setup(struct vb2_queue *vq,
|
||||||
struct s5p_mfc_ctx *ctx = fh_to_ctx(vq->drv_priv);
|
struct s5p_mfc_ctx *ctx = fh_to_ctx(vq->drv_priv);
|
||||||
struct s5p_mfc_dev *dev = ctx->dev;
|
struct s5p_mfc_dev *dev = ctx->dev;
|
||||||
|
|
||||||
if (ctx->state != MFCINST_GOT_INST) {
|
|
||||||
mfc_err("inavlid state: %d\n", ctx->state);
|
|
||||||
return -EINVAL;
|
|
||||||
}
|
|
||||||
if (vq->type == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE) {
|
if (vq->type == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE) {
|
||||||
|
if (ctx->state != MFCINST_GOT_INST) {
|
||||||
|
mfc_err("inavlid state: %d\n", ctx->state);
|
||||||
|
return -EINVAL;
|
||||||
|
}
|
||||||
|
|
||||||
if (ctx->dst_fmt)
|
if (ctx->dst_fmt)
|
||||||
*plane_count = ctx->dst_fmt->num_planes;
|
*plane_count = ctx->dst_fmt->num_planes;
|
||||||
else
|
else
|
||||||
|
|
Loading…
Reference in a new issue