diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-02-19 11:18:04 +0100 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2013-02-20 08:42:24 +1000 |
| commit | 8fcb6c4748822f8f594536e47b9b0701b6c33e7a (patch) | |
| tree | 5ec9eeedab787615541f7d18b796752c5c6b6a93 | |
| parent | 8e26875e21f7b01787018cbc0faf8bd099599cdb (diff) | |
| download | linux-stable-8fcb6c4748822f8f594536e47b9b0701b6c33e7a.tar.gz linux-stable-8fcb6c4748822f8f594536e47b9b0701b6c33e7a.tar.bz2 linux-stable-8fcb6c4748822f8f594536e47b9b0701b6c33e7a.zip | |
drm/cma-helper: fixup compilation
/me grabs a few brown paper bags
So it looks like I've broken compilation in
commit 6aed8ec3f76a22217c9ae183d32b1aa990bed069
Author: Daniel Vetter <daniel.vetter@ffwll.ch>
Date: Sun Jan 20 17:32:21 2013 +0100
drm: review locking for drm_fb_helper_restore_fbdev_mode
Fix it up again.
v2: Only deref fbdev_cma once we're sure it's non-NULL, noticed by
Thierry Reding.
Reported-by: Wu Fengguang <fengguang.wu@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: Thierry Reding <thierry.reding@avionic-design.de>
Signed-off-by: Dave Airlie <airlied@redhat.com>
| -rw-r--r-- | drivers/gpu/drm/drm_fb_cma_helper.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/gpu/drm/drm_fb_cma_helper.c b/drivers/gpu/drm/drm_fb_cma_helper.c index e851658f87d5..1c8549dae99a 100644 --- a/drivers/gpu/drm/drm_fb_cma_helper.c +++ b/drivers/gpu/drm/drm_fb_cma_helper.c @@ -377,10 +377,13 @@ EXPORT_SYMBOL_GPL(drm_fbdev_cma_fini); */ void drm_fbdev_cma_restore_mode(struct drm_fbdev_cma *fbdev_cma) { - drm_modeset_lock_all(dev); - if (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); + drm_modeset_unlock_all(dev); + } } EXPORT_SYMBOL_GPL(drm_fbdev_cma_restore_mode); |