drm/i915: fixup load-detect on enabled, but not active pipe
authorDaniel Vetter <daniel.vetter@ffwll.ch>
Fri, 20 Apr 2012 19:03:36 +0000 (21:03 +0200)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Sun, 22 Apr 2012 09:12:13 +0000 (11:12 +0200)
commite95c8438ea1c56c254f0607c8fb6bca7f463c744
tree57bbe9d5665a039b5d7e3bf5a473299a1c917264
parent66f75a5d028beaf67c931435fdc3e7823125730c
drm/i915: fixup load-detect on enabled, but not active pipe

Somehow we have a fast-path that tries to avoid going through
the load-detect code when the encode already has a crtc associated.
But this fails horribly when the crtc is off. The load detect pipe
itself manages this case well (and also does not forget to restore the
dpms state), so just rip out this special case.

The issue seems to go back all the way to the commit that originally
introduced load-detection on the vga output:

commit e4a5d54f924ea5ce2913d9d0687d034004816465
Author: Ma Ling <ling.ma@intel.com>
Date:   Tue May 26 11:31:00 2009 +0800

    drm/i915: Add support for VGA load detection (pre-945).

Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=43020
Reported-by: Jean Delvare <khali@linux-fr.org>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-Off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
drivers/gpu/drm/i915/intel_crt.c