From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH 3/3] drm/fb-helper: Disable cursors and planes when restoring fbdev mode Date: Tue, 4 Jun 2013 11:39:56 +0200 Message-ID: <20130604093956.GV15743@phenom.ffwll.local> References: <1370265042-13969-1-git-send-email-ville.syrjala@linux.intel.com> <1370265042-13969-4-git-send-email-ville.syrjala@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Return-path: Received: from mail-ea0-f180.google.com (mail-ea0-f180.google.com [209.85.215.180]) by gabe.freedesktop.org (Postfix) with ESMTP id 1D6DCE5F60 for ; Tue, 4 Jun 2013 02:40:00 -0700 (PDT) Received: by mail-ea0-f180.google.com with SMTP id k10so2147489eaj.11 for ; Tue, 04 Jun 2013 02:40:00 -0700 (PDT) Content-Disposition: inline In-Reply-To: <1370265042-13969-4-git-send-email-ville.syrjala@linux.intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dri-devel-bounces+sf-dri-devel=m.gmane.org@lists.freedesktop.org Errors-To: dri-devel-bounces+sf-dri-devel=m.gmane.org@lists.freedesktop.org To: ville.syrjala@linux.intel.com Cc: intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org On Mon, Jun 03, 2013 at 04:10:42PM +0300, ville.syrjala@linux.intel.com wro= te: > From: Ville Syrj=E4l=E4 > = > 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=E4l=E4 Yeah, I like that color ;-) For the series: Reviewed-by: Daniel Vetter > --- > 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_hel= per.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 =3D fb_helper->dev; > + struct drm_plane *plane; > bool error =3D 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 =3D 0; i < fb_helper->crtc_count; i++) { > struct drm_mode_set *mode_set =3D &fb_helper->crtc_info[i].mode_set; > + struct drm_crtc *crtc =3D mode_set->crtc; > + int ret; > + > + if (crtc->funcs->cursor_set) { > + ret =3D crtc->funcs->cursor_set(crtc, NULL, 0, 0, 0); > + if (ret) > + error =3D true; > + } > + > ret =3D drm_mode_set_config_internal(mode_set); > if (ret) > error =3D true; > -- = > 1.8.1.5 > = > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/dri-devel -- = Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch