xserver: Branch 'master'

[Robert Hooker]

2010/6/9 Michel Dänzer <michel at daenzer.net>:
> On Die, 2010-06-08 at 12:57 -0700, Keith Packard wrote:
>> On Tue, 08 Jun 2010 09:57:44 +0200, Michel Dänzer <michel at daenzer.net> wrote:
>>
>> > FWIW, I would have proposed the patch below instead.
>>
>> That looks better to me; I was after 'not crashing' while your patch
>> eliminates the DRI2 overhead for input-only windows. I'd like to see
>> this reviewed and tested with compiz (which shows the crash nicely) and
>> then I'll replace my hack with your fix.
>
> I've tested it with compiz, kwin and gnome-shell.
>
>
> --
> Earthling Michel Dänzer           |                http://www.vmware.com
> Libre software enthusiast         |          Debian, X and DRI developer
> _______________________________________________
> xorg-devel at lists.x.org: X.Org development
> Archives: http://lists.x.org/archives/xorg-devel
> Info: http://lists.x.org/mailman/listinfo/xorg-devel


Reverting fdb081b430ddffb495aa5b05bcc4cf10882ff4b2 and adding
Michael's patch does work fine here as well.

Tested-by: Robert Hooker <sarvatt at ubuntu.com>