1 files changed, 1 insertions, 3 deletions

diff --git a/drivers/gpu/drm/armada/armada_fbdev.c b/drivers/gpu/drm/armada/armada_fbdev.c
index 948cb14c561e..fd166f532ab9 100644
--- a/drivers/gpu/drm/armada/armada_fbdev.c
+++ b/drivers/gpu/drm/armada/armada_fbdev.c
@@ -181,10 +181,8 @@ void armada_fbdev_lastclose(struct drm_device *dev)
 {
         struct armada_private *priv = dev->dev_private;
 
-        drm_modeset_lock_all(dev);
         if (priv->fbdev)
-                drm_fb_helper_restore_fbdev_mode(priv->fbdev);
-        drm_modeset_unlock_all(dev);
+                drm_fb_helper_restore_fbdev_mode_unlocked(priv->fbdev);
 }
 
 void armada_fbdev_fini(struct drm_device *dev)