Commit 3d9e35a9 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Daniel Vetter

drm/fb-helper: Clarify drm_fb_helper_restore_fbdev_mode*()

As of commit 5ea1f752 ("drm: add
drm_fb_helper_restore_fbdev_mode_unlocked()"),
drm_fb_helper_restore_fbdev_mode() is no longer public, and drivers
should call drm_fb_helper_restore_fbdev_mode_unlocked() from their
->lastclose callbacks instead.

Update the documentation to reflect this, and absorb the one liner
drm_fb_helper_restore_fbdev_mode() into its single caller.
Signed-off-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 55579cfe
...@@ -56,8 +56,8 @@ static LIST_HEAD(kernel_fb_helper_list); ...@@ -56,8 +56,8 @@ static LIST_HEAD(kernel_fb_helper_list);
* Teardown is done with drm_fb_helper_fini(). * Teardown is done with drm_fb_helper_fini().
* *
* At runtime drivers should restore the fbdev console by calling * At runtime drivers should restore the fbdev console by calling
* drm_fb_helper_restore_fbdev_mode() from their ->lastclose callback. They * drm_fb_helper_restore_fbdev_mode_unlocked() from their ->lastclose callback.
* should also notify the fb helper code from updates to the output * They should also notify the fb helper code from updates to the output
* configuration by calling drm_fb_helper_hotplug_event(). For easier * configuration by calling drm_fb_helper_hotplug_event(). For easier
* integration with the output polling code in drm_crtc_helper.c the modeset * integration with the output polling code in drm_crtc_helper.c the modeset
* code provides a ->output_poll_changed callback. * code provides a ->output_poll_changed callback.
...@@ -354,21 +354,6 @@ static bool restore_fbdev_mode(struct drm_fb_helper *fb_helper) ...@@ -354,21 +354,6 @@ static bool restore_fbdev_mode(struct drm_fb_helper *fb_helper)
} }
return error; return error;
} }
/**
* drm_fb_helper_restore_fbdev_mode - restore fbdev configuration
* @fb_helper: fbcon to restore
*
* This should be called from driver's drm ->lastclose callback
* when implementing an fbcon on top of kms using this helper. This ensures that
* the user isn't greeted with a black screen when e.g. X dies.
*
* Use this variant if you need to bypass locking (panic), or already
* hold all modeset locks. Otherwise use drm_fb_helper_restore_fbdev_mode_unlocked()
*/
static bool drm_fb_helper_restore_fbdev_mode(struct drm_fb_helper *fb_helper)
{
return restore_fbdev_mode(fb_helper);
}
/** /**
* drm_fb_helper_restore_fbdev_mode_unlocked - restore fbdev configuration * drm_fb_helper_restore_fbdev_mode_unlocked - restore fbdev configuration
...@@ -417,7 +402,7 @@ static bool drm_fb_helper_force_kernel_mode(void) ...@@ -417,7 +402,7 @@ static bool drm_fb_helper_force_kernel_mode(void)
continue; continue;
drm_modeset_lock_all(dev); drm_modeset_lock_all(dev);
ret = drm_fb_helper_restore_fbdev_mode(helper); ret = restore_fbdev_mode(helper);
if (ret) if (ret)
error = true; error = true;
drm_modeset_unlock_all(dev); drm_modeset_unlock_all(dev);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment