media: staging/imx: fill vb2_v4l2_buffer field entry
authorPeter Seiderer <ps.report@gmx.net>
Thu, 15 Mar 2018 19:13:22 +0000 (15:13 -0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 4 Oct 2018 00:00:48 +0000 (17:00 -0700)
[ Upstream commit a38d4b71cb7a12b65317f4e3d59883a918957719 ]

- fixes gstreamer v4l2src warning:

  0:00:00.716640334  349  0x164f720 WARN  v4l2bufferpool gstv4l2bufferpool.c:1195:gst_v4l2_buffer_pool_dqbuf:<v4l2src0:pool:src> Driver should never set v4l2_buffer.field to ANY

- fixes v4l2-compliance test failure:

  Streaming ioctls:
          test read/write: OK (Not Supported)
              Video Capture:
                  Buffer: 0 Sequence: 0 Field: Any Timestamp: 58.383658s
                  fail: v4l2-test-buffers.cpp(297): g_field() == V4L2_FIELD_ANY

Signed-off-by: Peter Seiderer <ps.report@gmx.net>
Reviewed-by: Steve Longerbeam <steve_longerbeam@mentor.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/media/imx/imx-ic-prpencvf.c
drivers/staging/media/imx/imx-media-csi.c

index 0790b3d9e25560366a48633ddce37beeea21e762..111afd34aa3c328e385d09fcdb0f4c19dbc1e6cb 100644 (file)
@@ -210,6 +210,7 @@ static void prp_vb2_buf_done(struct prp_priv *priv, struct ipuv3_channel *ch)
 
        done = priv->active_vb2_buf[priv->ipu_buf_num];
        if (done) {
+               done->vbuf.field = vdev->fmt.fmt.pix.field;
                vb = &done->vbuf.vb2_buf;
                vb->timestamp = ktime_get_ns();
                vb2_buffer_done(vb, priv->nfb4eof ?
index 6d856118c223285702913468b29200e26c448a7c..83ecb5b2fb9e18c66426f56d18f8379f3cbdab9c 100644 (file)
@@ -171,6 +171,7 @@ static void csi_vb2_buf_done(struct csi_priv *priv)
 
        done = priv->active_vb2_buf[priv->ipu_buf_num];
        if (done) {
+               done->vbuf.field = vdev->fmt.fmt.pix.field;
                vb = &done->vbuf.vb2_buf;
                vb->timestamp = ktime_get_ns();
                vb2_buffer_done(vb, priv->nfb4eof ?