diff options
| author | Dave Airlie <airlied@redhat.com> | 2012-07-05 19:41:14 +0100 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2012-09-19 13:17:21 +1000 |
| commit | 0fe5c9348d84ffabc4d3bc390618b73bdfc0f12d (patch) | |
| tree | 804ca525de66a44e2231acd4b144d303ce6289cf | |
| parent | 03c62228d3163a4ff9ef9b218a13d02f755ac41e (diff) | |
WIP hacksgpu-switch-hacks2
| -rw-r--r-- | dix/privates.c | 2 | ||||
| -rw-r--r-- | hw/xfree86/common/xf86Init.c | 3 | ||||
| -rw-r--r-- | hw/xfree86/common/xf86platformBus.c | 4 |
3 files changed, 5 insertions, 4 deletions
diff --git a/dix/privates.c b/dix/privates.c index 55b9345a7..f5ee2a83b 100644 --- a/dix/privates.c +++ b/dix/privates.c @@ -383,7 +383,7 @@ dixRegisterPrivateKey(DevPrivateKey key, DevPrivateType type, unsigned size) else { /* Resize if we can, or make sure nothing's allocated if we can't */ if (!allocated_early[type]) - assert(!global_keys[type].created); + ; //assert(!global_keys[type].created); else if (!allocated_early[type] (dixReallocPrivates, bytes)) return FALSE; offset = global_keys[type].offset; diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c index 083ab9ba3..3bb2ee408 100644 --- a/hw/xfree86/common/xf86Init.c +++ b/hw/xfree86/common/xf86Init.c @@ -636,6 +636,7 @@ InitOutput(ScreenInfo * pScreenInfo, int argc, char **argv) * At this stage we know how many screens there are. */ +#if 0 if (xf86NumGPUScreens > 0) { int total_proto_screens = -1; for (i = 0; i < xf86NumGPUScreens; i++) { @@ -646,7 +647,7 @@ InitOutput(ScreenInfo * pScreenInfo, int argc, char **argv) for (i = 0; i < total_proto_screens; i++) xf86ImpedAddProtoScreens(i); } - +#endif for (i = 0; i < xf86NumScreens; i++) xf86InitViewport(xf86Screens[i]); diff --git a/hw/xfree86/common/xf86platformBus.c b/hw/xfree86/common/xf86platformBus.c index 353dc589c..76f1827f9 100644 --- a/hw/xfree86/common/xf86platformBus.c +++ b/hw/xfree86/common/xf86platformBus.c @@ -372,8 +372,8 @@ xf86platformProbeDev(DriverPtr drvp) if (j == xf86_num_platform_devices) continue; - foundScreen = probeSingleDevice(&xf86_platform_devices[j], drvp, devList[i], PLATFORM_PROBE_GPU_SCREEN); - if (!foundScreen) + //foundScreen = probeSingleDevice(&xf86_platform_devices[j], drvp, devList[i], PLATFORM_PROBE_GPU_SCREEN); + //if (!foundScreen) foundScreen = probeSingleDevice(&xf86_platform_devices[j], drvp, devList[i], 0); if (!foundScreen) continue; |