From 9672a69c761468ec920a8bc2442b8397b20578f8 Mon Sep 17 00:00:00 2001 From: Rodrigo Vivi Date: Wed, 15 Nov 2017 10:42:05 -0800 Subject: [PATCH] drm/i915/cnl: Extend HDMI 2.0 support to CNL. Mime-version: 1.0 Content-type: text/plain; charset=UTF-8 Content-transfer-encoding: 8bit Git-commit: 9672a69c761468ec920a8bc2442b8397b20578f8 Patch-mainline: v4.16-rc1 References: FATE#322643 bsc#1055900 Starting on GLK we support HDMI 2.0. So this patch only extend the work Shashank has made to GLK to CNL. V2: The version that compiles :/ V3: Invert order to newer || older platforms check. (Ville). Cc: Ville Syrjälä Cc: Paulo Zanoni Cc: Shashank Sharma Cc: Manasi Navare Signed-off-by: Rodrigo Vivi Reviewed-by: Ville Syrjälä Link: https://patchwork.freedesktop.org/patch/msgid/20171115184205.8104-1-rodrigo.vivi@intel.com Acked-by: Takashi Iwai --- drivers/gpu/drm/i915/intel_hdmi.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) --- a/drivers/gpu/drm/i915/intel_hdmi.c +++ b/drivers/gpu/drm/i915/intel_hdmi.c @@ -1236,7 +1236,7 @@ static int intel_hdmi_source_max_tmds_cl &dev_priv->vbt.ddi_port_info[encoder->port]; int max_tmds_clock; - if (IS_GEMINILAKE(dev_priv)) + if (INTEL_GEN(dev_priv) >= 10 || IS_GEMINILAKE(dev_priv)) max_tmds_clock = 594000; else if (INTEL_GEN(dev_priv) >= 8 || IS_HASWELL(dev_priv)) max_tmds_clock = 300000; @@ -1512,7 +1512,8 @@ bool intel_hdmi_compute_config(struct in pipe_config->lane_count = 4; - if (scdc->scrambling.supported && IS_GEMINILAKE(dev_priv)) { + if (scdc->scrambling.supported && (INTEL_GEN(dev_priv) >= 10 || + IS_GEMINILAKE(dev_priv))) { if (scdc->scrambling.low_rates) pipe_config->hdmi_scrambling = true; @@ -2036,7 +2037,7 @@ void intel_hdmi_init_connector(struct in connector->doublescan_allowed = 0; connector->stereo_allowed = 1; - if (IS_GEMINILAKE(dev_priv)) + if (INTEL_GEN(dev_priv) >= 10 || IS_GEMINILAKE(dev_priv)) connector->ycbcr_420_allowed = true; intel_hdmi->ddc_bus = intel_hdmi_ddc_pin(dev_priv, port);