drm: bridge/dw_hdmi: simplify hdmi_config_AVI() a little

When a YCBCR format is selected, we can merely copy the colorimetry
information directly as we use the same definitions for both the
unpacked AVI info frame and the hdmi_data_info structure.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

diff --git a/drivers/gpu/drm/bridge/dw_hdmi.c b/drivers/gpu/drm/bridge/dw_hdmi.c
index 0f3ccfa3ccfc34b851d97a44ea6045024248f89f..a8bd3fbf4300dd934e2ec556d3e15fb47e4358db 100644 (file)
--- a/drivers/gpu/drm/bridge/dw_hdmi.c
+++ b/drivers/gpu/drm/bridge/dw_hdmi.c
@@ -943,10 +943,7 @@ static void hdmi_config_AVI(struct dw_hdmi *hdmi, struct drm_display_mode *mode)
                        frame.extended_colorimetry =
                                HDMI_EXTENDED_COLORIMETRY_XV_YCC_709;
        } else if (hdmi->hdmi_data.enc_out_format != RGB) {
-               if (hdmi->hdmi_data.colorimetry == HDMI_COLORIMETRY_ITU_601)
-                       frame.colorimetry = HDMI_COLORIMETRY_ITU_601;
-               else /*hdmi->hdmi_data.colorimetry == HDMI_COLORIMETRY_ITU_709*/
-                       frame.colorimetry = HDMI_COLORIMETRY_ITU_709;
+               frame.colorimetry = hdmi->hdmi_data.colorimetry;
                frame.extended_colorimetry = HDMI_EXTENDED_COLORIMETRY_XV_YCC_601;
        } else { /* Carries no data */
                frame.colorimetry = HDMI_COLORIMETRY_NONE;