summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/armada/armada_fbdev.c
diff options
context:
space:
mode:
authorRob Clark <robdclark@gmail.com>2014-05-30 12:29:48 -0400
committerDave Airlie <airlied@redhat.com>2014-06-05 10:02:40 +1000
commit5ea1f752ae04be403a3dc8ec876a60d7f5f6990a (patch)
tree74b622f4eae713fdafc6aa946cfde3153580772c /drivers/gpu/drm/armada/armada_fbdev.c
parent51fd371bbaf94018a1223b4e2cf20b9880fd92d4 (diff)
downloadblackbird-op-linux-5ea1f752ae04be403a3dc8ec876a60d7f5f6990a.tar.gz
blackbird-op-linux-5ea1f752ae04be403a3dc8ec876a60d7f5f6990a.zip
drm: add drm_fb_helper_restore_fbdev_mode_unlocked()
All drm_fb_helper_restore_fbdev_mode() call sites, save one, do the same locking. Simplify this into drm_fb_helper_restore_fbdev_mode_unlocked(). Signed-off-by: Rob Clark <robdclark@gmail.com> Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/armada/armada_fbdev.c')
-rw-r--r--drivers/gpu/drm/armada/armada_fbdev.c4
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)
OpenPOWER on IntegriCloud