| Message ID | 1370265042-13969-4-git-send-email-ville.syrjala@linux.intel.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
On Mon, Jun 03, 2013 at 04:10:42PM +0300, ville.syrjala@linux.intel.com wrote: > From: Ville Syrjälä <ville.syrjala@linux.intel.com> > > 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: Ville Syrjälä <ville.syrjala@linux.intel.com> Yeah, I like that color ;-) For the series: Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> > --- > drivers/gpu/drm/drm_fb_helper.c | 18 ++++++++++++++++-- > 1 file changed, 16 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c > index 0df0ebb..3d13ca6e2 100644 > --- a/drivers/gpu/drm/drm_fb_helper.c > +++ b/drivers/gpu/drm/drm_fb_helper.c > @@ -287,13 +287,27 @@ EXPORT_SYMBOL(drm_fb_helper_debug_leave); > */ > 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; > - 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++) { > 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); > if (ret) > error = true; > -- > 1.8.1.5 > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/dri-devel
diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c index 0df0ebb..3d13ca6e2 100644 --- a/drivers/gpu/drm/drm_fb_helper.c +++ b/drivers/gpu/drm/drm_fb_helper.c @@ -287,13 +287,27 @@ EXPORT_SYMBOL(drm_fb_helper_debug_leave); */ 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; - 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++) { 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); if (ret) error = true;