From: Paulo Zanoni Date: Thu, 2 Jul 2015 22:25:12 +0000 (-0300) Subject: drm/i915: intel_unregister_dsm_handler() doesn't need struct_mutex X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=b5e4b84d9f12b093780a4e90e51604c3b4706cde;p=linux-beck.git drm/i915: intel_unregister_dsm_handler() doesn't need struct_mutex So don't grab the lock before calling the function. Reviewed-by: Chris wilson Signed-off-by: Paulo Zanoni Signed-off-by: Daniel Vetter --- diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index e1f9ae69a13a..8ddeb294f1eb 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -15603,12 +15603,10 @@ void intel_modeset_cleanup(struct drm_device *dev) */ drm_kms_helper_poll_fini(dev); - mutex_lock(&dev->struct_mutex); - intel_unregister_dsm_handler(); + mutex_lock(&dev->struct_mutex); intel_fbc_disable(dev); - mutex_unlock(&dev->struct_mutex); /* flush any delayed tasks or pending work */