From: Bob Paauwe Date: Fri, 22 Mar 2019 17:58:45 +0000 (-0700) Subject: drm/i915/ehl: EHL outputs are different from ICL X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=759c9ab55b5bf315be79e57f6ea32640d183e5a3;p=openwrt%2Fstaging%2Fblogic.git drm/i915/ehl: EHL outputs are different from ICL Configure the correct set of outputs for EHL. EHL has three DDI's plus DSI. Cc: Lucas De Marchi Signed-off-by: Bob Paauwe Signed-off-by: Rodrigo Vivi Reviewed-by: Lucas De Marchi Reviewed-by: José Roberto de Souza Link: https://patchwork.freedesktop.org/patch/msgid/20190322175847.25707-4-rodrigo.vivi@intel.com --- diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 17fb9f2c15c2..1a8617f5e2e4 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -14713,7 +14713,12 @@ static void intel_setup_outputs(struct drm_i915_private *dev_priv) if (!HAS_DISPLAY(dev_priv)) return; - if (INTEL_GEN(dev_priv) >= 11) { + if (IS_ELKHARTLAKE(dev_priv)) { + intel_ddi_init(dev_priv, PORT_A); + intel_ddi_init(dev_priv, PORT_B); + intel_ddi_init(dev_priv, PORT_C); + icl_dsi_init(dev_priv); + } else if (INTEL_GEN(dev_priv) >= 11) { intel_ddi_init(dev_priv, PORT_A); intel_ddi_init(dev_priv, PORT_B); intel_ddi_init(dev_priv, PORT_C);