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

Keith Packard keithp at keithp.com
Sun Oct 3 19:36:26 PDT 2010

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

Signed-off-by: Keith Packard <keithp at keithp.com>
 drivers/gpu/drm/i915/intel_display.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 9792285..a4cc072 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -6052,9 +6052,9 @@ void intel_modeset_cleanup(struct drm_device *dev)
 	struct drm_crtc *crtc;
 	struct intel_crtc *intel_crtc;
+	drm_kms_helper_poll_fini(dev);
-	drm_kms_helper_poll_fini(dev);
 	list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {

More information about the dri-devel mailing list