I don't see it in your master branch: http://cgit.freedesktop.org/~daniels/xserver/log/
Your git repo also doesn't seem to know about that commit reference: http://cgit.freedesktop.org/~daniels/xserver/commit/?id=0701a18b51213ae588cbe82069c0b6eefb8deae7 Also, any thoughts that this could be related to but #31017? http://bugs.freedesktop.org/show_bug.cgi?id=31017 --Jeremy On May 25, 2011, at 03:56, Daniel Stone wrote: > Hi, > > On Mon, May 23, 2011 at 12:26:07PM +0200, Cyril Brulebois wrote: >> Hi Jeremy, >> >> Marko Macek <[email protected]> (21/05/2011): >>> Please apply this patch: >>> >>> Fix crash after resetting root window background pixmap to None, then >>> setting background color. >>> >>> Signed-off-by: Marko Macek <[email protected]> > > Thanks Marko! > > I have this (committed earlier) as: > commit 0701a18b51213ae588cbe82069c0b6eefb8deae7 > Author: Marko Macek <[email protected]> > Date: Sat May 21 13:30:59 2011 +0100 > > DIX: Set backgroundState correctly for root window > > When we change the root window's background to None, and we've run with > -wr or -br for a forced solid background, make sure we also change the > background state to BackgroundPixel, so we don't try to lookup either > pScreen->whitePixel or pScreen->blackPixel as a pixmap. > > Signed-off-by: Marko Macek <[email protected]> > Reviewed-by: Walter Harms <[email protected]> > Reviewed-by: Daniel Stone <[email protected]> > > It should be in the master branch of > git://people.freedesktop.org/~daniels/xserver. > >> it'd be nice to keep an eye on that patch and pick it for the 1.10 >> branch, even though it appears not to be committed to master yet. >> >> Seems to be the same issue as in: >> http://bugs.debian.org/626331 >> >> A fix for #36986 would also be appreciated for rc3 or final: >> https://bugs.freedesktop.org/show_bug.cgi?id=36986 >> >> (still being discussed in another thread.) > > Yeah, it's a bit of a clanger, and most distros seem to run with either > -wr or -br, so this would be a great stable candidate. Let's give it a > quick run in master and see if it doesn't destroy anything. > > Cheers, > Daniel > _______________________________________________ > [email protected]: X.Org development > Archives: http://lists.x.org/archives/xorg-devel > Info: http://lists.x.org/mailman/listinfo/xorg-devel > _______________________________________________ [email protected]: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
