Merge airlied/drm-next into drm-intel-next-queued

[mirror_ubuntu-bionic-kernel.git] / drivers / gpu / drm / i915 / intel_hdmi.c

diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
index eb0c559b66c116a3a9041765376278ee2b2efe49..2ef1ee85129d1880c58c8cc6e395cbb0ce49fed1 100644 (file)
--- a/drivers/gpu/drm/i915/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/intel_hdmi.c
@@ -472,12 +472,18 @@ static void intel_hdmi_set_avi_infoframe(struct drm_encoder *encoder,
                return;
        }
 
+       if (crtc_state->ycbcr420)
+               frame.avi.colorspace = HDMI_COLORSPACE_YUV420;
+       else
+               frame.avi.colorspace = HDMI_COLORSPACE_RGB;
+
        drm_hdmi_avi_infoframe_quant_range(&frame.avi, adjusted_mode,
                                           crtc_state->limited_color_range ?
                                           HDMI_QUANTIZATION_RANGE_LIMITED :
                                           HDMI_QUANTIZATION_RANGE_FULL,
                                           intel_hdmi->rgb_quant_range_selectable);
 
+       /* TODO: handle pixel repetition for YCBCR420 outputs */
        intel_write_infoframe(encoder, crtc_state, &frame);
 }
 
@@ -1295,6 +1301,9 @@ intel_hdmi_mode_valid(struct drm_connector *connector,
        if (mode->flags & DRM_MODE_FLAG_DBLCLK)
                clock *= 2;
 
+       if (drm_mode_is_420_only(&connector->display_info, mode))
+               clock /= 2;
+
        /* check if we can do 8bpc */
        status = hdmi_port_clock_valid(hdmi, clock, true, force_dvi);
 
@@ -1330,8 +1339,15 @@ static bool hdmi_12bpc_possible(struct intel_crtc_state *crtc_state)
                if (connector_state->crtc != crtc_state->base.crtc)
                        continue;
 
-               if ((info->edid_hdmi_dc_modes & DRM_EDID_HDMI_DC_36) == 0)
-                       return false;
+               if (crtc_state->ycbcr420) {
+                       const struct drm_hdmi_info *hdmi = &info->hdmi;
+
+                       if (!(hdmi->y420_dc_modes & DRM_EDID_YCBCR420_DC_36))
+                               return false;
+               } else {
+                       if (!(info->edid_hdmi_dc_modes & DRM_EDID_HDMI_DC_36))
+                               return false;
+               }
        }
 
        /* Display Wa #1139 */
@@ -1342,6 +1358,36 @@ static bool hdmi_12bpc_possible(struct intel_crtc_state *crtc_state)
        return true;
 }
 
+static bool
+intel_hdmi_ycbcr420_config(struct drm_connector *connector,
+                          struct intel_crtc_state *config,
+                          int *clock_12bpc, int *clock_8bpc)
+{
+       struct intel_crtc *intel_crtc = to_intel_crtc(config->base.crtc);
+
+       if (!connector->ycbcr_420_allowed) {
+               DRM_ERROR("Platform doesn't support YCBCR420 output\n");
+               return false;
+       }
+
+       /* YCBCR420 TMDS rate requirement is half the pixel clock */
+       config->port_clock /= 2;
+       *clock_12bpc /= 2;
+       *clock_8bpc /= 2;
+       config->ycbcr420 = true;
+
+       /* YCBCR 420 output conversion needs a scaler */
+       if (skl_update_scaler_crtc(config)) {
+               DRM_DEBUG_KMS("Scaler allocation for output failed\n");
+               return false;
+       }
+
+       intel_pch_panel_fitting(intel_crtc, config,
+                               DRM_MODE_SCALE_FULLSCREEN);
+
+       return true;
+}
+
 bool intel_hdmi_compute_config(struct intel_encoder *encoder,
                               struct intel_crtc_state *pipe_config,
                               struct drm_connector_state *conn_state)
@@ -1349,7 +1395,8 @@ bool intel_hdmi_compute_config(struct intel_encoder *encoder,
        struct intel_hdmi *intel_hdmi = enc_to_intel_hdmi(&encoder->base);
        struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
        struct drm_display_mode *adjusted_mode = &pipe_config->base.adjusted_mode;
-       struct drm_scdc *scdc = &conn_state->connector->display_info.hdmi.scdc;
+       struct drm_connector *connector = conn_state->connector;
+       struct drm_scdc *scdc = &connector->display_info.hdmi.scdc;
        struct intel_digital_connector_state *intel_conn_state =
                to_intel_digital_connector_state(conn_state);
        int clock_8bpc = pipe_config->base.adjusted_mode.crtc_clock;
@@ -1379,6 +1426,14 @@ bool intel_hdmi_compute_config(struct intel_encoder *encoder,
                clock_12bpc *= 2;
        }
 
+       if (drm_mode_is_420_only(&connector->display_info, adjusted_mode)) {
+               if (!intel_hdmi_ycbcr420_config(connector, pipe_config,
+                                               &clock_12bpc, &clock_8bpc)) {
+                       DRM_ERROR("Can't support YCBCR420 output\n");
+                       return false;
+               }
+       }
+
        if (HAS_PCH_SPLIT(dev_priv) && !HAS_DDI(dev_priv))
                pipe_config->has_pch_encoder = true;
 
@@ -1860,6 +1915,9 @@ void intel_hdmi_init_connector(struct intel_digital_port *intel_dig_port,
        connector->doublescan_allowed = 0;
        connector->stereo_allowed = 1;
 
+       if (IS_GEMINILAKE(dev_priv))
+               connector->ycbcr_420_allowed = true;
+
        intel_hdmi->ddc_bus = intel_hdmi_ddc_pin(dev_priv, port);
 
        switch (port) {