Skip to content

Commit

Permalink
drm/i915: Take modeset locks around intel_modeset_setup_hw_state()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
vsyrjala authored and danvet committed Dec 3, 2013
1 parent 993fc6e commit 0274766
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions drivers/gpu/drm/i915/intel_display.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 0274766

Please sign in to comment.