Skip to content

Commit

Permalink
drm/i915: avoid struct mutex output_poll mutex lock loop on unload
Browse files Browse the repository at this point in the history
Cancel the output polling work proc before acquiring the struct mutex
to avoid acquiring the work proc mutex with the struct mutex
held. This avoids inverting the lock order seen when the work proc
runs.

Signed-off-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
  • Loading branch information
Keith Packard authored and Chris Wilson committed Oct 4, 2010
1 parent 58e10eb commit f87ea76
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/gpu/drm/i915/intel_display.c
Original file line number Diff line number Diff line change
Expand Up @@ -6127,9 +6127,9 @@ void intel_modeset_cleanup(struct drm_device *dev)
struct drm_crtc *crtc;
struct intel_crtc *intel_crtc;

drm_kms_helper_poll_fini(dev);
mutex_lock(&dev->struct_mutex);

drm_kms_helper_poll_fini(dev);
intel_fbdev_fini(dev);

list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
Expand Down

0 comments on commit f87ea76

Please sign in to comment.