diff --git a/[refs] b/[refs]
index 55e8442fa826..13e7fd81dcdc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8e26875e21f7b01787018cbc0faf8bd099599cdb
+refs/heads/master: 8fcb6c4748822f8f594536e47b9b0701b6c33e7a
diff --git a/trunk/drivers/gpu/drm/drm_fb_cma_helper.c b/trunk/drivers/gpu/drm/drm_fb_cma_helper.c
index e851658f87d5..1c8549dae99a 100644
--- a/trunk/drivers/gpu/drm/drm_fb_cma_helper.c
+++ b/trunk/drivers/gpu/drm/drm_fb_cma_helper.c
@@ -377,10 +377,13 @@ EXPORT_SYMBOL_GPL(drm_fbdev_cma_fini);
  */
 void drm_fbdev_cma_restore_mode(struct drm_fbdev_cma *fbdev_cma)
 {
-	drm_modeset_lock_all(dev);
-	if (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);
+		drm_modeset_unlock_all(dev);
+	}
 }
 EXPORT_SYMBOL_GPL(drm_fbdev_cma_restore_mode);