diff options
| author | marha <marha@users.sourceforge.net> | 2012-07-09 08:08:20 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-07-09 08:08:20 +0200 |
| commit | c29d91cfd8df084f16d0d2dfa82c3a86f7719a73 (patch) | |
| tree | f0ac6c2a9f9da0ce818aa4fc04a1be6e8121962f /xorg-server/hw/xfree86/common/xf86Globals.c | |
| parent | 336bad93d146931c160d8517edfdf0bee49ad9f7 (diff) | |
| download | vcxsrv-c29d91cfd8df084f16d0d2dfa82c3a86f7719a73.tar.gz vcxsrv-c29d91cfd8df084f16d0d2dfa82c3a86f7719a73.tar.bz2 vcxsrv-c29d91cfd8df084f16d0d2dfa82c3a86f7719a73.zip | |
fontconfig libX11 mesa pixman xserver git update 9 Jul 2012
Diffstat (limited to 'xorg-server/hw/xfree86/common/xf86Globals.c')
| -rw-r--r-- | xorg-server/hw/xfree86/common/xf86Globals.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/xorg-server/hw/xfree86/common/xf86Globals.c b/xorg-server/hw/xfree86/common/xf86Globals.c index 0071004eb..7df7a80c4 100644 --- a/xorg-server/hw/xfree86/common/xf86Globals.c +++ b/xorg-server/hw/xfree86/common/xf86Globals.c @@ -51,6 +51,7 @@ DevPrivateKeyRec xf86CreateRootWindowKeyRec; DevPrivateKeyRec xf86ScreenKeyRec; ScrnInfoPtr *xf86Screens = NULL; /* List of ScrnInfos */ +ScrnInfoPtr *xf86GPUScreens = NULL; /* List of ScrnInfos */ const unsigned char byte_reversed[256] = { 0x00, 0x80, 0x40, 0xc0, 0x20, 0xa0, 0x60, 0xe0, @@ -125,11 +126,16 @@ xf86InfoRec xf86Info = { #if defined(CONFIG_HAL) || defined(CONFIG_UDEV) || defined(CONFIG_WSCONS) .forceInputDevices = FALSE, .autoAddDevices = TRUE, - .autoEnableDevices = TRUE + .autoEnableDevices = TRUE, #else .forceInputDevices = TRUE, .autoAddDevices = FALSE, - .autoEnableDevices = FALSE + .autoEnableDevices = FALSE, +#endif +#if defined(CONFIG_UDEV_KMS) + .autoAddGPU = TRUE, +#else + .autoAddGPU = FALSE, #endif }; @@ -153,6 +159,7 @@ int xf86NumDrivers = 0; InputDriverPtr *xf86InputDriverList = NULL; int xf86NumInputDrivers = 0; int xf86NumScreens = 0; +int xf86NumGPUScreens = 0; const char *xf86VisualNames[] = { "StaticGray", |