Imported Debian patch 2:1.15.1-0ubuntu2.6
[deb_xorg-server.git] / debian / patches / xf86-inactive-gpuscreen.patch
1 diff --git a/hw/xfree86/common/xf86platformBus.c b/hw/xfree86/common/xf86platformBus.c
2 index c790d50..a47c2d0 100644
3 --- a/hw/xfree86/common/xf86platformBus.c
4 +++ b/hw/xfree86/common/xf86platformBus.c
5 @@ -387,7 +387,7 @@ xf86platformProbeDev(DriverPtr drvp)
6 Bool foundScreen = FALSE;
7 GDevPtr *devList;
8 const unsigned numDevs = xf86MatchDevice(drvp->driverName, &devList);
9 - int i, j;
10 + int i, j, flags;
11
12 /* find the main device or any device specificed in xorg.conf */
13 for (i = 0; i < numDevs; i++) {
14 @@ -415,7 +415,11 @@ xf86platformProbeDev(DriverPtr drvp)
15 if (j == xf86_num_platform_devices)
16 continue;
17
18 - foundScreen = probeSingleDevice(&xf86_platform_devices[j], drvp, devList[i], 0);
19 + flags = 0;
20 + if (!devList[i]->active)
21 + flags |= PLATFORM_PROBE_GPU_SCREEN;
22 +
23 + foundScreen = probeSingleDevice(&xf86_platform_devices[j], drvp, devList[i], flags);
24 if (!foundScreen)
25 continue;
26 }