Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8fcb6c47 authored by Daniel Vetter's avatar Daniel Vetter Committed by Dave Airlie
Browse files

drm/cma-helper: fixup compilation 



/me grabs a few brown paper bags

So it looks like I've broken compilation in

commit 6aed8ec3
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: default avatarWu Fengguang <fengguang.wu@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: default avatarThierry Reding <thierry.reding@avionic-design.de>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 8e26875e

drivers/gpu/drm/drm_fb_cma_helper.c

+6 −3
Original line number Diff line number Diff line
@@ -377,11 +377,14 @@ 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);

	if (fbdev_cma)

		drm_fb_helper_restore_fbdev_mode(&fbdev_cma->fb_helper);

		drm_modeset_unlock_all(dev);

	}

}

EXPORT_SYMBOL_GPL(drm_fbdev_cma_restore_mode);



/**