[Nouveau] [Nouveau-cvs] xf86-video-nv: Branch 'master'

[Ben Skeggs]

On Mon, 2009-09-14 at 20:26 +0300, Pekka Paalanen wrote:
> On Sun, 13 Sep 2009 20:06:59 -0700 (PDT)
> darktama at kemper.freedesktop.org (Ben Skeggs) wrote:
> 
> >  src/drmmode_display.c |    6 ++++++
> >  src/nv_driver.c       |    2 ++
> >  2 files changed, 8 insertions(+)
> > 
> > New commits:
> > commit 6c045fc44783454180d7b3d00b5f25436bd5544e
> > Author: Ben Skeggs <bskeggs at redhat.com>
> > Date:   Mon Sep 14 13:04:12 2009 +1000
> > 
> >     kms: wait for fbcon to be copied before continuing
> > 
> > diff --git a/src/drmmode_display.c b/src/drmmode_display.c
> > index 3010396..e152e7f 100644
> > --- a/src/drmmode_display.c
> > +++ b/src/drmmode_display.c
> > @@ -215,6 +215,12 @@ drmmode_fbcon_copy(ScrnInfoPtr pScrn)
> >  	exa->DoneCopy(pdpix);
> >  	FIRE_RING (pNv->chan);
> >  
> > +	/* wait for completion before continuing, avoids seeing a momentary
> > +	 * flash of "corruption" on occasion
> > +	 */
> > +	nouveau_bo_map(pNv->scanout, NOUVEAU_BO_RDWR);
> > +	nouveau_bo_unmap(pNv->scanout);
> > +
> >  	pScreen->DestroyPixmap(pdpix);
> >  	pScreen->DestroyPixmap(pspix);
> >  }
> > diff --git a/src/nv_driver.c b/src/nv_driver.c
> > index 9317b5e..645895d 100644
> > --- a/src/nv_driver.c
> > +++ b/src/nv_driver.c
> > @@ -741,6 +741,8 @@ NVPreInitDRM(ScrnInfoPtr pScrn)
> >  	 */
> >  #ifdef XF86DRM_MODE
> >  	pNv->kms_enable = !drmCheckModesettingSupported(bus_id);
> > +	if (pNv->kms_enable)
> > +	    pScrn->canDoBGNoneRoot = 1;
> >  #endif
> >  	xf86DrvMsg(pScrn->scrnIndex, X_PROBED,
> >  		   "[drm] kernel modesetting %s\n", pNv->kms_enable ?
> 
> What does this latter hunk do?
> It just seems completely irrelevant wrt. the commit message.
It's something that's needed for fedora's X server to get the completely
smooth transition from plymouth (graphical boot thingo) to gdm.  It
tells X that the driver supports the transition and stops X from
zeroing/filling in the root window on startup.

For whatever reason the patch hasn't made it to the upstream X server as
of yet.

Ben.
>