diff options
| author | Rob Clark <robdclark@gmail.com> | 2014-05-30 20:29:48 +0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2014-06-05 04:02:40 +0400 |
| commit | 5ea1f752ae04be403a3dc8ec876a60d7f5f6990a (patch) | |
| tree | 74b622f4eae713fdafc6aa946cfde3153580772c /drivers/gpu/drm/drm_fb_cma_helper.c | |
| parent | 51fd371bbaf94018a1223b4e2cf20b9880fd92d4 (diff) | |
| download | linux-5ea1f752ae04be403a3dc8ec876a60d7f5f6990a.tar.xz | |
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/drm_fb_cma_helper.c')
| -rw-r--r-- | drivers/gpu/drm/drm_fb_cma_helper.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/gpu/drm/drm_fb_cma_helper.c b/drivers/gpu/drm/drm_fb_cma_helper.c index 61b5a47ad239..f27c883be391 100644 --- a/drivers/gpu/drm/drm_fb_cma_helper.c +++ b/drivers/gpu/drm/drm_fb_cma_helper.c @@ -429,13 +429,8 @@ EXPORT_SYMBOL_GPL(drm_fbdev_cma_fini); */ void drm_fbdev_cma_restore_mode(struct drm_fbdev_cma *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); - } + if (fbdev_cma) + drm_fb_helper_restore_fbdev_mode_unlocked(&fbdev_cma->fb_helper); } EXPORT_SYMBOL_GPL(drm_fbdev_cma_restore_mode); |