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

Commit 28579f37 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

drm/fb-helper: Make docs for fb_set_suspend wrappers consistent 



I figured I might as well go ocd and make them booleans and rename the
locked version too.

v2: Review from Noralf.

Reported-by: default avatarkbuild test robot <fengguang.wu@intel.com>
Cc: Noralf Trønnes <noralf@tronnes.org>
Fixes: cfe63423 ("drm/fb-helper: Add drm_fb_helper_set_suspend_unlocked()")
Acked-by: default avatarNoralf Trønnes <noralf@tronnes.org>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20160823152727.31788-1-daniel.vetter@ffwll.ch
parent 15d8bb48

drivers/gpu/drm/drm_fb_helper.c

+5 −5
Original line number Diff line number Diff line
@@ -1035,16 +1035,16 @@ EXPORT_SYMBOL(drm_fb_helper_cfb_imageblit); 
/**

 * drm_fb_helper_set_suspend - wrapper around fb_set_suspend

 * @fb_helper: driver-allocated fbdev helper

 * @state: desired state, zero to resume, non-zero to suspend

 * @suspend: whether to suspend or resume

 *

 * A wrapper around fb_set_suspend implemented by fbdev core.

 * Use drm_fb_helper_set_suspend_unlocked() if you don't need to take

 * the lock yourself

 */

void drm_fb_helper_set_suspend(struct drm_fb_helper *fb_helper, int state)

void drm_fb_helper_set_suspend(struct drm_fb_helper *fb_helper, bool suspend)

{

	if (fb_helper && fb_helper->fbdev)

		fb_set_suspend(fb_helper->fbdev, state);

		fb_set_suspend(fb_helper->fbdev, suspend);

}

EXPORT_SYMBOL(drm_fb_helper_set_suspend);
@@ -1052,7 +1052,7 @@ EXPORT_SYMBOL(drm_fb_helper_set_suspend); 
 * drm_fb_helper_set_suspend_unlocked - wrapper around fb_set_suspend that also

 *                                      takes the console lock

 * @fb_helper: driver-allocated fbdev helper

 * @state: desired state, zero to resume, non-zero to suspend

 * @suspend: whether to suspend or resume

 *

 * A wrapper around fb_set_suspend() that takes the console lock. If the lock

 * isn't available on resume, a worker is tasked with waiting for the lock
@@ -1065,7 +1065,7 @@ EXPORT_SYMBOL(drm_fb_helper_set_suspend); 
 * Use drm_fb_helper_set_suspend() if you need to take the lock yourself.

 */

void drm_fb_helper_set_suspend_unlocked(struct drm_fb_helper *fb_helper,

					int suspend)

					bool suspend)

{

	if (!fb_helper || !fb_helper->fbdev)

		return;

include/drm/drm_fb_helper.h

+4 −4
Original line number Diff line number Diff line
@@ -265,9 +265,9 @@ void drm_fb_helper_cfb_copyarea(struct fb_info *info, 
void drm_fb_helper_cfb_imageblit(struct fb_info *info,

				 const struct fb_image *image);



void drm_fb_helper_set_suspend(struct drm_fb_helper *fb_helper, int state);

void drm_fb_helper_set_suspend(struct drm_fb_helper *fb_helper, bool suspend);

void drm_fb_helper_set_suspend_unlocked(struct drm_fb_helper *fb_helper,

					int suspend);

					bool suspend);



int drm_fb_helper_setcmap(struct fb_cmap *cmap, struct fb_info *info);
@@ -421,12 +421,12 @@ static inline void drm_fb_helper_cfb_imageblit(struct fb_info *info, 
}



static inline void drm_fb_helper_set_suspend(struct drm_fb_helper *fb_helper,

					     int state)

					     bool suspend)

{

}



static inline void

drm_fb_helper_set_suspend_unlocked(struct drm_fb_helper *fb_helper, int suspend)

drm_fb_helper_set_suspend_unlocked(struct drm_fb_helper *fb_helper, bool suspend)

{

}