[git pull] revert + dri1 fix

[Keith Packard]

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.

>       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?

-- 
keith.packard at intel.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 827 bytes
Desc: not available
URL: <http://lists.x.org/archives/xorg-devel/attachments/20121213/b9494240/attachment.pgp>