summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorBob Paauwe <bob.j.paauwe@intel.com>2019-03-20 14:15:46 -0700
committerLucas De Marchi <lucas.demarchi@intel.com>2019-04-02 13:30:05 -0700
commitf722b8c1e2a2a85add58a8ffd9cb794d4d6287ff (patch)
tree6a00409cc91170c05e1dc44126815c1d5842aa5d /drivers
parent7881e6057586b0bdaaffef13d9f88c95a86ba484 (diff)
downloadlinux-stable-f722b8c1e2a2a85add58a8ffd9cb794d4d6287ff.tar.gz
linux-stable-f722b8c1e2a2a85add58a8ffd9cb794d4d6287ff.tar.bz2
linux-stable-f722b8c1e2a2a85add58a8ffd9cb794d4d6287ff.zip
drm/i915/ehl: All EHL ports are combo phys
Unlike ICL, all of the output ports are combo phys so just return true in intel_port_is_combophy for all EHL ports to indicate that. v2: Return false in intel_port_is_tc since no EHL ports are TC. (Jose) Cc: Jose Souza <jose.souza@intel.com> Signed-off-by: Bob Paauwe <bob.j.paauwe@intel.com> Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com> Reviewed-by: José Roberto de Souza <jose.souza@intel.com> Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20190320211547.519266-1-bob.j.paauwe@intel.com
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpu/drm/i915/intel_display.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 8576a7f799f2..6facfba79a41 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -6180,6 +6180,9 @@ bool intel_port_is_combophy(struct drm_i915_private *dev_priv, enum port port)
if (port == PORT_NONE)
return false;
+ if (IS_ELKHARTLAKE(dev_priv))
+ return port <= PORT_C;
+
if (INTEL_GEN(dev_priv) >= 11)
return port <= PORT_B;
@@ -6188,7 +6191,7 @@ bool intel_port_is_combophy(struct drm_i915_private *dev_priv, enum port port)
bool intel_port_is_tc(struct drm_i915_private *dev_priv, enum port port)
{
- if (INTEL_GEN(dev_priv) >= 11)
+ if (INTEL_GEN(dev_priv) >= 11 && !IS_ELKHARTLAKE(dev_priv))
return port >= PORT_C && port <= PORT_F;
return false;