diff options
| author | Krzysztof Mazur <krzysiek@podlesie.net> | 2012-12-19 14:03:41 +0400 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2013-01-16 05:13:11 +0400 |
| commit | 29abfe4ddc74a2a597f4a47f02df1f5c4ad4a521 (patch) | |
| tree | 65a058e3ecb7d9c9cbab2eeeb212620cc28bf12e /drivers/gpu/drm/i915/intel_lvds.c | |
| parent | f7967624720d43679b9767c76dc2e97b6f3eb34f (diff) | |
| download | linux-29abfe4ddc74a2a597f4a47f02df1f5c4ad4a521.tar.xz | |
i915: ensure that VGA plane is disabled
commit 0fde901f1ddd2ce0e380a6444f1fb7ca555859e9 upstream.
Some broken systems (like HP nc6120) in some cases, usually after LID
close/open, enable VGA plane, making display unusable (black screen on LVDS,
some strange mode on VGA output). We used to disable VGA plane only once at
startup. Now we also check, if VGA plane is still disabled while changing
mode, and fix that if something changed it.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=57434
Signed-off-by: Krzysztof Mazur <krzysiek@podlesie.net>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
[bwh: Backported to 3.2: intel_modeset_setup_hw_state() does not
exist, so call i915_redisable_vga() directly from intel_lid_notify()]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_lvds.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_lvds.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c index cf5ea3de88cf..c6d09663602b 100644 --- a/drivers/gpu/drm/i915/intel_lvds.c +++ b/drivers/gpu/drm/i915/intel_lvds.c @@ -535,6 +535,7 @@ static int intel_lid_notify(struct notifier_block *nb, unsigned long val, mutex_lock(&dev->mode_config.mutex); drm_helper_resume_force_mode(dev); + i915_redisable_vga(dev); mutex_unlock(&dev->mode_config.mutex); return NOTIFY_OK; |