Merge tag 'drm-next-2019-07-16' of git://anongit.freedesktop.org/drm/drm

[linux-2.6-microblaze.git] / drivers / staging / media / imx / imx7-media-csi.c

diff --git a/drivers/staging/media/imx/imx7-media-csi.c b/drivers/staging/media/imx/imx7-media-csi.c
index f775870..500b4c0 100644 (file)
--- a/drivers/staging/media/imx/imx7-media-csi.c
+++ b/drivers/staging/media/imx/imx7-media-csi.c
@@ -1002,8 +1002,6 @@ static int imx7_csi_try_fmt(struct imx7_csi *csi,
 
                sdformat->format.colorspace = in_fmt->colorspace;
                sdformat->format.xfer_func = in_fmt->xfer_func;
-               sdformat->format.quantization = in_fmt->quantization;
-               sdformat->format.ycbcr_enc = in_fmt->ycbcr_enc;
                break;
        case IMX7_CSI_PAD_SINK:
                *cc = imx_media_find_mbus_format(sdformat->format.code,
@@ -1014,13 +1012,13 @@ static int imx7_csi_try_fmt(struct imx7_csi *csi,
                                                         false);
                        sdformat->format.code = (*cc)->codes[0];
                }
-
-               imx_media_fill_default_mbus_fields(&sdformat->format, in_fmt,
-                                                  false);
                break;
        default:
                return -EINVAL;
        }
+
+       imx_media_try_colorimetry(&sdformat->format, false);
+
        return 0;
 }