xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drm/cma-helper: fixup compilation

Browse Source 
/me grabs a few brown paper bags

So it looks like I've broken compilation in

commit 6aed8ec3f7
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>
This commit is contained in:
Daniel Vetter
2013-02-19 11:18:04 +01:00
committed by Dave Airlie
parent 8e26875e21
commit 8fcb6c4748
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/gpu/drm/drm_fb_cma_helper.c
View File

@@ -377,10 +377,13 @@ EXPORT_SYMBOL_GPL(drm_fbdev_cma_fini);
*/ */
void drm_fbdev_cma_restore_mode(struct drm_fbdev_cma *fbdev_cma) 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_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); EXPORT_SYMBOL_GPL(drm_fbdev_cma_restore_mode);