[PATCH v3 4/4] media: imx: Allow BT.709 encoding for IC routes

[Steve Longerbeam]

The IC now supports BT.709 Y'CbCr encoding, in addition to existing BT.601
encoding, so allow both, for pipelines that route through the IC.

Reported-by: Tim Harvey <thar...@gateworks.com>
Signed-off-by: Steve Longerbeam <slongerb...@gmail.com>
---
Changes in v2:
- move ic_route check above default colorimetry checks, and fill default
  colorimetry for ic_route, otherwise it's not possible to set BT.709
  encoding for ic routes.
---
 drivers/staging/media/imx/imx-media-utils.c | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/drivers/staging/media/imx/imx-media-utils.c 
b/drivers/staging/media/imx/imx-media-utils.c
index 5f110d90a4ef..dde0e47550d7 100644
--- a/drivers/staging/media/imx/imx-media-utils.c
+++ b/drivers/staging/media/imx/imx-media-utils.c
@@ -544,6 +544,19 @@ void imx_media_fill_default_mbus_fields(struct 
v4l2_mbus_framefmt *tryfmt,
        if (tryfmt->field == V4L2_FIELD_ANY)
                tryfmt->field = fmt->field;
 
+       if (ic_route) {
+               if (tryfmt->colorspace == V4L2_COLORSPACE_DEFAULT)
+                       tryfmt->colorspace = fmt->colorspace;
+
+               tryfmt->quantization = is_rgb ?
+                       V4L2_QUANTIZATION_FULL_RANGE :
+                       V4L2_QUANTIZATION_LIM_RANGE;
+
+               if (tryfmt->ycbcr_enc != V4L2_YCBCR_ENC_601 &&
+                   tryfmt->ycbcr_enc != V4L2_YCBCR_ENC_709)
+                       tryfmt->ycbcr_enc = V4L2_YCBCR_ENC_601;
+       }
+
        /* fill colorimetry if necessary */
        if (tryfmt->colorspace == V4L2_COLORSPACE_DEFAULT) {
                tryfmt->colorspace = fmt->colorspace;
@@ -566,13 +579,6 @@ void imx_media_fill_default_mbus_fields(struct 
v4l2_mbus_framefmt *tryfmt,
                                        tryfmt->ycbcr_enc);
                }
        }
-
-       if (ic_route) {
-               tryfmt->quantization = is_rgb ?
-                       V4L2_QUANTIZATION_FULL_RANGE :
-                       V4L2_QUANTIZATION_LIM_RANGE;
-               tryfmt->ycbcr_enc = V4L2_YCBCR_ENC_601;
-       }
 }
 EXPORT_SYMBOL_GPL(imx_media_fill_default_mbus_fields);
 
-- 
2.17.1