summaryrefslogtreecommitdiff
path: root/drivers/staging/media/imx/imx-media-vdic.c
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2019-07-12 07:29:57 +1000
committerDave Airlie <airlied@redhat.com>2019-07-12 07:30:20 +1000
commitf27b99a1cea7ce3a2a24b907c5a998f0ad5a0268 (patch)
tree45792fb429a0a592568ebfe82ec1af86ebbfd497 /drivers/staging/media/imx/imx-media-vdic.c
parentb784d6bff97154af829e46271dbb16967106a493 (diff)
parentfee77829083ad70845bd650f3c84c5900c5abae1 (diff)
Merge tag 'imx-drm-next-2019-07-05' of git://git.pengutronix.de/git/pza/linux into drm-nextdrm-next-2019-07-15
drm/imx: IPUv3 image converter improvements, enable scanout FIFO watermark - Fix a saturation bit position in the colorspace converter configuration memory. - Fully describe colorspace conversions in the API to the imx-media driver. - Add support for limited range and Rec.709 YUV encoding. - Enable colorimetry configuration via the media-controller API. - Enable the double write reduction feature for memory bandwidth savings when the image converter writes YUV 4:2:0 output. - Enable a scanout FIFO watermark feature that can increase priority of scanout read transfers at the memory controller whenever the FIFO runs low. Signed-off-by: Dave Airlie <airlied@redhat.com> From: Philipp Zabel <p.zabel@pengutronix.de> Link: https://patchwork.freedesktop.org/patch/msgid/1562326831.4291.8.camel@pengutronix.de
Diffstat (limited to 'drivers/staging/media/imx/imx-media-vdic.c')
-rw-r--r--drivers/staging/media/imx/imx-media-vdic.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/staging/media/imx/imx-media-vdic.c b/drivers/staging/media/imx/imx-media-vdic.c
index 4487374c9435..fbafd7fb7aeb 100644
--- a/drivers/staging/media/imx/imx-media-vdic.c
+++ b/drivers/staging/media/imx/imx-media-vdic.c
@@ -617,14 +617,13 @@ static void vdic_try_fmt(struct vdic_priv *priv,
&sdformat->format.height,
MIN_H, MAX_H_VDIC, H_ALIGN, S_ALIGN);
- imx_media_fill_default_mbus_fields(&sdformat->format, infmt,
- true);
-
/* input must be interlaced! Choose SEQ_TB if not */
if (!V4L2_FIELD_HAS_BOTH(sdformat->format.field))
sdformat->format.field = V4L2_FIELD_SEQ_TB;
break;
}
+
+ imx_media_try_colorimetry(&sdformat->format, true);
}
static int vdic_set_fmt(struct v4l2_subdev *sd,