diff options
author | Rob Clark <robdclark@gmail.com> | 2014-05-30 12:29:48 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2014-06-04 20:02:40 -0400 |
commit | 5ea1f752ae04be403a3dc8ec876a60d7f5f6990a (patch) | |
tree | 74b622f4eae713fdafc6aa946cfde3153580772c /drivers/gpu/drm/gma500 | |
parent | 51fd371bbaf94018a1223b4e2cf20b9880fd92d4 (diff) |
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/gma500')
-rw-r--r-- | drivers/gpu/drm/gma500/psb_drv.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/gpu/drm/gma500/psb_drv.c b/drivers/gpu/drm/gma500/psb_drv.c index 0a3101a3db19..59ea45e5c97e 100644 --- a/drivers/gpu/drm/gma500/psb_drv.c +++ b/drivers/gpu/drm/gma500/psb_drv.c | |||
@@ -112,11 +112,9 @@ static void psb_driver_lastclose(struct drm_device *dev) | |||
112 | struct drm_psb_private *dev_priv = dev->dev_private; | 112 | struct drm_psb_private *dev_priv = dev->dev_private; |
113 | struct psb_fbdev *fbdev = dev_priv->fbdev; | 113 | struct psb_fbdev *fbdev = dev_priv->fbdev; |
114 | 114 | ||
115 | drm_modeset_lock_all(dev); | 115 | ret = drm_fb_helper_restore_fbdev_mode_unlocked(&fbdev->psb_fb_helper); |
116 | ret = drm_fb_helper_restore_fbdev_mode(&fbdev->psb_fb_helper); | ||
117 | if (ret) | 116 | if (ret) |
118 | DRM_DEBUG("failed to restore crtc mode\n"); | 117 | DRM_DEBUG("failed to restore crtc mode\n"); |
119 | drm_modeset_unlock_all(dev); | ||
120 | 118 | ||
121 | return; | 119 | return; |
122 | } | 120 | } |