Commit f87ea761 authored by Keith Packard's avatar Keith Packard Committed by Chris Wilson

drm/i915: avoid struct mutex output_poll mutex lock loop on unload

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: default avatarKeith Packard <keithp@keithp.com>
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
parent 58e10eb9
...@@ -6127,9 +6127,9 @@ void intel_modeset_cleanup(struct drm_device *dev) ...@@ -6127,9 +6127,9 @@ void intel_modeset_cleanup(struct drm_device *dev)
struct drm_crtc *crtc; struct drm_crtc *crtc;
struct intel_crtc *intel_crtc; struct intel_crtc *intel_crtc;
drm_kms_helper_poll_fini(dev);
mutex_lock(&dev->struct_mutex); mutex_lock(&dev->struct_mutex);
drm_kms_helper_poll_fini(dev);
intel_fbdev_fini(dev); intel_fbdev_fini(dev);
list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) { list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment