drm/i915: intel_unregister_dsm_handler() doesn't need struct_mutex
authorPaulo Zanoni <paulo.r.zanoni@intel.com>
Thu, 2 Jul 2015 22:25:12 +0000 (19:25 -0300)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Mon, 6 Jul 2015 12:34:10 +0000 (14:34 +0200)
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>
drivers/gpu/drm/i915/intel_display.c

index e1f9ae69a13a3474476f1e5846ae8e2e73430e19..8ddeb294f1ebbf4ef0be7fad36e22723114e70a8 100644 (file)
@@ -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 */