iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

media: imx: imx7-media-csi: Fix video field handling

Browse Source 
[ Upstream commit f7b8488bd3 ]

Commit 4791bd7d6a ("media: imx: Try colorimetry at both sink and
source pads") reworked the way that formats are set on the sink pad of
the CSI subdevice, and accidentally removed video field handling.
Restore it by defaulting to V4L2_FIELD_NONE if the field value isn't
supported, with the only two supported value being V4L2_FIELD_NONE and
V4L2_FIELD_INTERLACED.

Fixes: 4791bd7d6a ("media: imx: Try colorimetry at both sink and source pads")
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Rui Miguel Silva <rmfrfs@gmail.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Laurent Pinchart
2020-03-10 17:06:29 +01:00
committed by Greg Kroah-Hartman
parent dd051f1af5
commit 61ed3dcad8
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/staging/media/imx/imx7-media-csi.c
View File

@ -1009,6 +1009,7 @@ static int imx7_csi_try_fmt(struct imx7_csi *csi,
sdformat->format.width = in_fmt->width; sdformat->format.width = in_fmt->width;
sdformat->format.height = in_fmt->height; sdformat->format.height = in_fmt->height;
sdformat->format.code = in_fmt->code; sdformat->format.code = in_fmt->code;
sdformat->format.field = in_fmt->field;
*cc = in_cc; *cc = in_cc;
sdformat->format.colorspace = in_fmt->colorspace; sdformat->format.colorspace = in_fmt->colorspace;
@ -1023,6 +1024,9 @@ static int imx7_csi_try_fmt(struct imx7_csi *csi,
false); false);
sdformat->format.code = (*cc)->codes[0]; sdformat->format.code = (*cc)->codes[0];
} }
if (sdformat->format.field != V4L2_FIELD_INTERLACED)
sdformat->format.field = V4L2_FIELD_NONE;
break; break;
default: default:
return -EINVAL; return -EINVAL;