[PATCH v2] media: nxp: imx8-isi: fix v4l2-compliance test errors

[PATCH v2] media: nxp: imx8-isi: fix v4l2-compliance test errors

[Laurentiu Palcu]

Running the v4l2-compliance (1.27.0-5208, SHA: af114250d48d) on the m2m
device fails on the MMAP streaming tests, with the following messages:

fail: v4l2-test-buffers.cpp(240): g_field() == V4L2_FIELD_ANY
fail: v4l2-test-buffers.cpp(1508): buf.qbuf(node)

Apparently, the driver does not properly set the field member of
vb2_v4l2_buffer struct, returning the default V4L2_FIELD_ANY value which
is against the guidelines.

Fixes: cf21f328fcafac ("media: nxp: Add i.MX8 ISI driver")
Signed-off-by: Laurentiu Palcu <laurentiu.palcu@oss.nxp.com>
---
v2:
 * set the 'field' in mxc_isi_video_buffer_prepare() as suggested by
   Laurent;
 * change the commit subject to make it more generic as the fix does
   not address only the M2M device compliance errors but also the
   video capture ones;

 drivers/media/platform/nxp/imx8-isi/imx8-isi-video.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/media/platform/nxp/imx8-isi/imx8-isi-video.c b/drivers/media/platform/nxp/imx8-isi/imx8-isi-video.c
index ddd42a8f17884..60c55d6839431 100644
--- a/drivers/media/platform/nxp/imx8-isi/imx8-isi-video.c
+++ b/drivers/media/platform/nxp/imx8-isi/imx8-isi-video.c
@@ -898,6 +898,7 @@ int mxc_isi_video_buffer_prepare(struct mxc_isi_dev *isi, struct vb2_buffer *vb2
 				 const struct v4l2_pix_format_mplane *pix)
 {
 	unsigned int i;
+	struct vb2_v4l2_buffer *v4l2_buf = to_vb2_v4l2_buffer(vb2);
 
 	for (i = 0; i < info->mem_planes; i++) {
 		unsigned long size = pix->plane_fmt[i].sizeimage;
@@ -911,6 +912,8 @@ int mxc_isi_video_buffer_prepare(struct mxc_isi_dev *isi, struct vb2_buffer *vb2
 		vb2_set_plane_payload(vb2, i, size);
 	}
 
+	v4l2_buf->field = pix->field;
+
 	return 0;
 }
 
-- 
2.44.1

Re: [PATCH v2] media: nxp: imx8-isi: fix v4l2-compliance test errors

[Laurent Pinchart]

Hi Laurentiu,

Thank you for the patch.

On Tue, Sep 24, 2024 at 01:33:04PM +0300, Laurentiu Palcu wrote:
> Running the v4l2-compliance (1.27.0-5208, SHA: af114250d48d) on the m2m
> device fails on the MMAP streaming tests, with the following messages:
> 
> fail: v4l2-test-buffers.cpp(240): g_field() == V4L2_FIELD_ANY
> fail: v4l2-test-buffers.cpp(1508): buf.qbuf(node)
> 
> Apparently, the driver does not properly set the field member of
> vb2_v4l2_buffer struct, returning the default V4L2_FIELD_ANY value which
> is against the guidelines.
> 
> Fixes: cf21f328fcafac ("media: nxp: Add i.MX8 ISI driver")
> Signed-off-by: Laurentiu Palcu <laurentiu.palcu@oss.nxp.com>
> ---
> v2:
>  * set the 'field' in mxc_isi_video_buffer_prepare() as suggested by
>    Laurent;
>  * change the commit subject to make it more generic as the fix does
>    not address only the M2M device compliance errors but also the
>    video capture ones;
> 
>  drivers/media/platform/nxp/imx8-isi/imx8-isi-video.c | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/drivers/media/platform/nxp/imx8-isi/imx8-isi-video.c b/drivers/media/platform/nxp/imx8-isi/imx8-isi-video.c
> index ddd42a8f17884..60c55d6839431 100644
> --- a/drivers/media/platform/nxp/imx8-isi/imx8-isi-video.c
> +++ b/drivers/media/platform/nxp/imx8-isi/imx8-isi-video.c
> @@ -898,6 +898,7 @@ int mxc_isi_video_buffer_prepare(struct mxc_isi_dev *isi, struct vb2_buffer *vb2
>  				 const struct v4l2_pix_format_mplane *pix)
>  {
>  	unsigned int i;
> +	struct vb2_v4l2_buffer *v4l2_buf = to_vb2_v4l2_buffer(vb2);

I'll swap those two lines when applying, we usually sort lines (roughly)
by decreasing length.

Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

>  
>  	for (i = 0; i < info->mem_planes; i++) {
>  		unsigned long size = pix->plane_fmt[i].sizeimage;
> @@ -911,6 +912,8 @@ int mxc_isi_video_buffer_prepare(struct mxc_isi_dev *isi, struct vb2_buffer *vb2
>  		vb2_set_plane_payload(vb2, i, size);
>  	}
>  
> +	v4l2_buf->field = pix->field;
> +
>  	return 0;
>  }
>  

-- 
Regards,

Laurent Pinchart