media: venus: helpers: handle correctly vbuf field
authorStanimir Varbanov <stanimir.varbanov@linaro.org>
Thu, 27 Jun 2019 12:09:34 +0000 (09:09 -0300)
committerMauro Carvalho Chehab <mchehab+samsung@kernel.org>
Mon, 5 Aug 2019 13:57:28 +0000 (10:57 -0300)
Correct handling of OUTPUT buffers field and make v4l2-compliance
happy.

Signed-off-by: Stanimir Varbanov <stanimir.varbanov@linaro.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
drivers/media/platform/qcom/venus/helpers.c

index 176facd..c948c4e 100644 (file)
@@ -998,6 +998,17 @@ int venus_helper_vb2_buf_prepare(struct vb2_buffer *vb)
 {
        struct venus_inst *inst = vb2_get_drv_priv(vb->vb2_queue);
        unsigned int out_buf_size = venus_helper_get_opb_size(inst);
+       struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
+
+       if (V4L2_TYPE_IS_OUTPUT(vb->vb2_queue->type)) {
+               if (vbuf->field == V4L2_FIELD_ANY)
+                       vbuf->field = V4L2_FIELD_NONE;
+               if (vbuf->field != V4L2_FIELD_NONE) {
+                       dev_err(inst->core->dev, "%s field isn't supported\n",
+                               __func__);
+                       return -EINVAL;
+               }
+       }
 
        if (vb->type == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE &&
            vb2_plane_size(vb, 0) < out_buf_size)