]> git.karo-electronics.de Git - karo-tx-linux.git/commit
drm/i915: Take modeset locks around intel_modeset_setup_hw_state()
authorVille Syrjälä <ville.syrjala@linux.intel.com>
Mon, 2 Dec 2013 09:08:06 +0000 (11:08 +0200)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Tue, 3 Dec 2013 22:14:26 +0000 (23:14 +0100)
commit027476642811f8559cbe00ef6cc54db230e48a20
tree17e408db9b226d0098cc2c242d95198e54a4a11c
parent993fc6ebaf4af6fdfde08cc8649c386e483a5908
drm/i915: Take modeset locks around intel_modeset_setup_hw_state()

Some lower level things get angry if we don't have modeset locks
during intel_modeset_setup_hw_state(). Actually the resume and
lid_notify codepaths alreday hold the locks, but the init codepath
doesn't, so fix that.

Note: This slipped through since we only disable pipes if the
plane/pipe linking doesn't match. Which is only relevant on older
gen3 mobile machines, if the BIOS fails to set up our preferred
linking.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Cc: stable@vger.kernel.org
Tested-and-reported-by: Paul Bolle <pebolle@tiscali.nl>
[danvet: Add note now that I could confirm my theory with the log
files Paul Bolle provided.]
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
drivers/gpu/drm/i915/intel_display.c