Commit 533df0fe authored by Imre Deak's avatar Imre Deak Committed by Daniel Vetter

drm/i915: vlv: fix VGA hotplug after modeset

Since

commit 912d812e
Author: Daniel Vetter <daniel.vetter@ffwll.ch>
Date:   Thu Oct 11 20:08:23 2012 +0200

    drm/i915/crt: don't set HOTPLUG bits on !PCH

on VLV we don't detect any VGA unplug event after a modeset, since there we
reset the ADPA hotplug bits. Fix it by preserving the hotplug bits on VLV as
well.
Signed-off-by: default avatarImre Deak <imre.deak@intel.com>
[danvet: For consistency use gen >= 5 like in Chris' exact same fix
in intel_crt_reset.]
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent fbf46025
...@@ -274,7 +274,7 @@ static void intel_crt_mode_set(struct intel_encoder *encoder) ...@@ -274,7 +274,7 @@ static void intel_crt_mode_set(struct intel_encoder *encoder)
struct drm_display_mode *adjusted_mode = &crtc->config.adjusted_mode; struct drm_display_mode *adjusted_mode = &crtc->config.adjusted_mode;
u32 adpa; u32 adpa;
if (HAS_PCH_SPLIT(dev)) if (INTEL_INFO(dev)->gen >= 5)
adpa = ADPA_HOTPLUG_BITS; adpa = ADPA_HOTPLUG_BITS;
else else
adpa = 0; adpa = 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment