summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/omapdrm
diff options
context:
space:
mode:
authorRob Clark <robdclark@gmail.com>2014-05-30 18:29:48 +0200
committerDave Airlie <airlied@redhat.com>2014-06-05 02:02:40 +0200
commit5ea1f752ae04be403a3dc8ec876a60d7f5f6990a (patch)
tree74b622f4eae713fdafc6aa946cfde3153580772c /drivers/gpu/drm/omapdrm
parentdrm: convert crtc and connection_mutex to ww_mutex (v5) (diff)
downloadlinux-5ea1f752ae04be403a3dc8ec876a60d7f5f6990a.tar.xz
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/omapdrm')
-rw-r--r--drivers/gpu/drm/omapdrm/omap_drv.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/gpu/drm/omapdrm/omap_drv.c b/drivers/gpu/drm/omapdrm/omap_drv.c
index c8270e4b26f3..002b9721e85a 100644
--- a/drivers/gpu/drm/omapdrm/omap_drv.c
+++ b/drivers/gpu/drm/omapdrm/omap_drv.c
@@ -588,9 +588,7 @@ static void dev_lastclose(struct drm_device *dev)
}
}
- drm_modeset_lock_all(dev);
- ret = drm_fb_helper_restore_fbdev_mode(priv->fbdev);
- drm_modeset_unlock_all(dev);
+ ret = drm_fb_helper_restore_fbdev_mode_unlocked(priv->fbdev);
if (ret)
DBG("failed to restore crtc mode");
}