drm: add drm_fb_helper_restore_fbdev_mode_unlocked()

[karo-tx-linux.git] / drivers / gpu / drm / i915 / intel_fbdev.c

diff --git a/drivers/gpu/drm/i915/intel_fbdev.c b/drivers/gpu/drm/i915/intel_fbdev.c
index e2d416149f53726df7cbdf816a635a3c0679fdb3..6ea2d75464da517dd05cc4b07f81e13bb37a157b 100644 (file)
--- a/drivers/gpu/drm/i915/intel_fbdev.c
+++ b/drivers/gpu/drm/i915/intel_fbdev.c
@@ -687,11 +687,7 @@ void intel_fbdev_restore_mode(struct drm_device *dev)
        if (!dev_priv->fbdev)
                return;
 
-       drm_modeset_lock_all(dev);
-
-       ret = drm_fb_helper_restore_fbdev_mode(&dev_priv->fbdev->helper);
+       ret = drm_fb_helper_restore_fbdev_mode_unlocked(&dev_priv->fbdev->helper);
        if (ret)
                DRM_DEBUG("failed to restore crtc mode\n");
-
-       drm_modeset_unlock_all(dev);
 }