drm: add drm_fb_helper_restore_fbdev_mode_unlocked()

[linux-2.6-block.git] / drivers / gpu / drm / drm_fb_cma_helper.c

diff --git a/drivers/gpu/drm/drm_fb_cma_helper.c b/drivers/gpu/drm/drm_fb_cma_helper.c
index 61b5a47ad239115f00b2359f41bd99734645e443..f27c883be391f51dfe0ef41e9cada8ed76ee67dc 100644 (file)
--- a/drivers/gpu/drm/drm_fb_cma_helper.c
+++ b/drivers/gpu/drm/drm_fb_cma_helper.c
@@ -429,13 +429,8 @@ EXPORT_SYMBOL_GPL(drm_fbdev_cma_fini);
  */
 void drm_fbdev_cma_restore_mode(struct drm_fbdev_cma *fbdev_cma)
 {
-       if (fbdev_cma) {
-               struct drm_device *dev = fbdev_cma->fb_helper.dev;
-
-               drm_modeset_lock_all(dev);
-               drm_fb_helper_restore_fbdev_mode(&fbdev_cma->fb_helper);
-               drm_modeset_unlock_all(dev);
-       }
+       if (fbdev_cma)
+               drm_fb_helper_restore_fbdev_mode_unlocked(&fbdev_cma->fb_helper);
 }
 EXPORT_SYMBOL_GPL(drm_fbdev_cma_restore_mode);