aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaulo Zanoni <paulo.r.zanoni@intel.com>2015-07-02 19:25:12 -0300
committerDaniel Vetter <daniel.vetter@ffwll.ch>2015-07-06 14:34:10 +0200
commitb5e4b84d9f12b093780a4e90e51604c3b4706cde (patch)
treeca1b2b7f3dd8c1704ad189b6c827a2714491a05e
parent5abeca4ec5d425538b73af58076990823a744e2a (diff)
downloadkernel_replicant_linux-b5e4b84d9f12b093780a4e90e51604c3b4706cde.tar.gz
kernel_replicant_linux-b5e4b84d9f12b093780a4e90e51604c3b4706cde.tar.bz2
kernel_replicant_linux-b5e4b84d9f12b093780a4e90e51604c3b4706cde.zip
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 <chris@chris-wilson.co.uk> Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
-rw-r--r--drivers/gpu/drm/i915/intel_display.c4
1 files changed, 1 insertions, 3 deletions
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 */