Starting on GLK we support HDMI 2.0. So this patch only
extend the work Shashank has made to GLK to CNL.

Cc: Paulo Zanoni <paulo.r.zan...@intel.com>
Cc: Shashank Sharma <shashank.sha...@intel.com>
Cc: Manasi Navare <manasi.d.nav...@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.v...@intel.com>
---
 drivers/gpu/drm/i915/intel_hdmi.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_hdmi.c 
b/drivers/gpu/drm/i915/intel_hdmi.c
index 2d95db64cdf2..1b22b587e98c 100644
--- a/drivers/gpu/drm/i915/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/intel_hdmi.c
@@ -1235,7 +1235,7 @@ static int intel_hdmi_source_max_tmds_clock(struct 
intel_encoder *encoder)
                &dev_priv->vbt.ddi_port_info[encoder->port];
        int max_tmds_clock;
 
-       if (IS_GEMINILAKE(dev_priv))
+       if (IS_GEMINILAKE(dev_priv) || INTEL_GEN(dev_priv) >= 10)
                max_tmds_clock = 594000;
        else if (INTEL_GEN(dev_priv) >= 8 || IS_HASWELL(dev_priv))
                max_tmds_clock = 300000;
@@ -1511,7 +1511,8 @@ bool intel_hdmi_compute_config(struct intel_encoder 
*encoder,
 
        pipe_config->lane_count = 4;
 
-       if (scdc->scrambling.supported && IS_GEMINILAKE(dev_priv)) {
+       if (scdc->scrambling.supported && (IS_GEMINILAKE(dev_priv) ||
+                                          INTEL_GEN(dev_priv) >= 10) {
                if (scdc->scrambling.low_rates)
                        pipe_config->hdmi_scrambling = true;
 
@@ -2033,7 +2034,7 @@ 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))
+       if (IS_GEMINILAKE(dev_priv) || INTEL_GEN(dev_priv) >= 10)
                connector->ycbcr_420_allowed = true;
 
        intel_hdmi->ddc_bus = intel_hdmi_ddc_pin(dev_priv, port);
-- 
2.13.6

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Reply via email to