[git pull] revert + dri1 fix

[Dave Airlie]

On Fri, Dec 14, 2012 at 6:57 AM, Keith Packard <keithp at keithp.com> wrote:
> Dave Airlie <airlied at gmail.com> writes:
>
>> Dave Airlie (2):
>>       dri1: fix dri1 startup since 459c6da0f907ba33d733c7e62a116184ba2f14e5
>
> This needs to use a server generation compare -- otherwise,
> drmSetServerInfo won't get called on server reset.

I don't think it ever did before either.

>
>>       Revert "xf86: Fix non-PCI configuration-less setups"
>
> Not entirely clear how this helps multi-GPU setups, but I guess we can
> let people without PCI help fix this?

It not clear how the original patch broke it either, but it did, so
revert it until we figure out the real answer.

Dave.