i915: ensure that VGA plane is disabled
authorKrzysztof Mazur <krzysiek@podlesie.net>
Wed, 19 Dec 2012 10:03:41 +0000 (11:03 +0100)
committerBen Hutchings <ben@decadent.org.uk>
Wed, 16 Jan 2013 01:13:11 +0000 (01:13 +0000)
commit29abfe4ddc74a2a597f4a47f02df1f5c4ad4a521
tree65a058e3ecb7d9c9cbab2eeeb212620cc28bf12e
parentf7967624720d43679b9767c76dc2e97b6f3eb34f
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>
drivers/gpu/drm/i915/i915_drv.h
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/i915/intel_lvds.c