diff options
| author | Jani Nikula <jani.nikula@intel.com> | 2015-09-18 15:54:50 +0300 |
|---|---|---|
| committer | Jani Nikula <jani.nikula@intel.com> | 2015-09-21 12:36:04 +0300 |
| commit | a78695d3ea045cd9977a8397c89171d762708f86 (patch) | |
| tree | 0f67644c1900e13ba51aad067853ec3830ecab1f /drivers/gpu/drm/i915/intel_dp.c | |
| parent | b5dada82ad624b69a2229c819d6a30b664a5606f (diff) | |
| download | lwn-a78695d3ea045cd9977a8397c89171d762708f86.tar.gz lwn-a78695d3ea045cd9977a8397c89171d762708f86.zip | |
drm/i915/skl: handle port E in cpt_digital_port_connected
SKL port E handling was added in
commit 26951caf55d73ceb1967b0bf12f6d0b96853508e
Author: Xiong Zhang <xiong.y.zhang@intel.com>
Date: Mon Aug 17 15:55:50 2015 +0800
drm/i915/skl: enable DDI-E hotplug
but the whole function was moved in a another branch in
commit b93433ccf64846820b9448f5ff5dd4348b58a8ed
Author: Jani Nikula <jani.nikula@intel.com>
Date: Thu Aug 20 10:47:36 2015 +0300
drm/i915: move ibx_digital_port_connected to intel_dp.c
and the addition was lost at some backmerge that I was unable to
identify. Put it back in.
Tested-by: Tomi Sarvela <tomix.p.sarvela@intel.com>
Reviewed-by: Mika Kuoppala <mika.kuoppala@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_dp.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_dp.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c index b8c4fc5a92f1..9700f774dc6c 100644 --- a/drivers/gpu/drm/i915/intel_dp.c +++ b/drivers/gpu/drm/i915/intel_dp.c @@ -4582,6 +4582,9 @@ static bool cpt_digital_port_connected(struct drm_i915_private *dev_priv, case PORT_D: bit = SDE_PORTD_HOTPLUG_CPT; break; + case PORT_E: + bit = SDE_PORTE_HOTPLUG_SPT; + break; default: MISSING_CASE(port->port); return false; |