Commit 3858bc5d authored by Ville Syrjälä's avatar Ville Syrjälä Committed by Dave Airlie

drm/fb-helper: Disable cursors and planes when restoring fbdev mode

Cursors and plane can obscure whatever fbdev wants to show the user.
Disable them all in drm_fb_helper_restore_fbdev_mode.

After the cursors and planes have been disabled, user space needs to
explicitly re-enable them to make them visible again.
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: default avatarDave Airlie <airlied@gmail.com>
parent 9125e618
...@@ -284,13 +284,27 @@ EXPORT_SYMBOL(drm_fb_helper_debug_leave); ...@@ -284,13 +284,27 @@ EXPORT_SYMBOL(drm_fb_helper_debug_leave);
*/ */
bool drm_fb_helper_restore_fbdev_mode(struct drm_fb_helper *fb_helper) bool drm_fb_helper_restore_fbdev_mode(struct drm_fb_helper *fb_helper)
{ {
struct drm_device *dev = fb_helper->dev;
struct drm_plane *plane;
bool error = false; bool error = false;
int i, ret; int i;
drm_warn_on_modeset_not_all_locked(dev);
drm_warn_on_modeset_not_all_locked(fb_helper->dev); list_for_each_entry(plane, &dev->mode_config.plane_list, head)
drm_plane_force_disable(plane);
for (i = 0; i < fb_helper->crtc_count; i++) { for (i = 0; i < fb_helper->crtc_count; i++) {
struct drm_mode_set *mode_set = &fb_helper->crtc_info[i].mode_set; struct drm_mode_set *mode_set = &fb_helper->crtc_info[i].mode_set;
struct drm_crtc *crtc = mode_set->crtc;
int ret;
if (crtc->funcs->cursor_set) {
ret = crtc->funcs->cursor_set(crtc, NULL, 0, 0, 0);
if (ret)
error = true;
}
ret = drm_mode_set_config_internal(mode_set); ret = drm_mode_set_config_internal(mode_set);
if (ret) if (ret)
error = true; error = true;
......
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