Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 02747664 authored by Ville Syrjälä's avatar Ville Syrjälä Committed by Daniel Vetter
Browse files

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: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Cc: stable@vger.kernel.org
Tested-and-reported-by: default avatarPaul Bolle <pebolle@tiscali.nl>
[danvet: Add note now that I could confirm my theory with the log
files Paul Bolle provided.]
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 993fc6eb

drivers/gpu/drm/i915/intel_display.c

+2 −0
Original line number Diff line number Diff line
@@ -11046,7 +11046,9 @@ void intel_modeset_gem_init(struct drm_device *dev) 


	intel_setup_overlay(dev);



	drm_modeset_lock_all(dev);

	intel_modeset_setup_hw_state(dev, false);

	drm_modeset_unlock_all(dev);

}



void intel_modeset_cleanup(struct drm_device *dev)