diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-02-15 11:24:35 +0100 |
|---|---|---|
| committer | Rob Clark <robdclark@gmail.com> | 2013-02-17 23:55:31 +0100 |
| commit | 50fdaae79abbfc4f04b5380ac5abf00fd448c5a5 (patch) | |
| tree | 8305c880274f55b07250fa2aef5e32210956f625 /drivers | |
| parent | Merge branch 'drm-fb-helper' of git://people.freedesktop.org/~danvet/drm into... (diff) | |
| download | linux-50fdaae79abbfc4f04b5380ac5abf00fd448c5a5.tar.xz linux-50fdaae79abbfc4f04b5380ac5abf00fd448c5a5.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.
Reported-by: Wu Fengguang <fengguang.wu@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpu/drm/drm_fb_cma_helper.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/drm_fb_cma_helper.c b/drivers/gpu/drm/drm_fb_cma_helper.c index e851658f87d5..ef68e34b16ec 100644 --- a/drivers/gpu/drm/drm_fb_cma_helper.c +++ b/drivers/gpu/drm/drm_fb_cma_helper.c @@ -377,6 +377,8 @@ EXPORT_SYMBOL_GPL(drm_fbdev_cma_fini); */ void drm_fbdev_cma_restore_mode(struct drm_fbdev_cma *fbdev_cma) { + struct drm_device *dev = fbdev_cma->fb_helper.dev; + drm_modeset_lock_all(dev); if (fbdev_cma) drm_fb_helper_restore_fbdev_mode(&fbdev_cma->fb_helper); |