X-Git-Url: https://git.piment-noir.org/?p=deb_xorg-server.git;a=blobdiff_plain;f=debian%2Fpatches%2F228_autobind_gpu.patch;h=4d1643372906214e64cecd2231e2d839830653d9;hp=e950c9dff0f53ca7ee6acac8cfddbbf040d859ca;hb=4db25562fe97995f20b8adc0f2e6959ed82e8635;hpb=7217e0ca50bba73dad94782e67980aeeb24ab693

diff --git a/debian/patches/228_autobind_gpu.patch b/debian/patches/228_autobind_gpu.patch
index e950c9d..4d16433 100644
--- a/debian/patches/228_autobind_gpu.patch
+++ b/debian/patches/228_autobind_gpu.patch
@@ -15,8 +15,6 @@ DO NOT UPSTREAM.
  hw/xfree86/modes/xf86Crtc.c         | 32 ++++++++++++++++++++++++++++++++
  3 files changed, 47 insertions(+), 0 deletions(-)
 
-diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
-index d231ced..89629c1 100644
 --- a/hw/xfree86/common/xf86Init.c
 +++ b/hw/xfree86/common/xf86Init.c
 @@ -361,6 +361,16 @@ xf86CreateRootWindow(WindowPtr pWin)
@@ -36,7 +34,7 @@ index d231ced..89629c1 100644
  static void
  InstallSignalHandlers(void)
  {
-@@ -926,6 +936,8 @@ InitOutput(ScreenInfo * pScreenInfo, int argc, char **argv)
+@@ -951,6 +961,8 @@ InitOutput(ScreenInfo * pScreenInfo, int
      for (i = 0; i < xf86NumGPUScreens; i++)
          AttachUnboundGPU(xf86Screens[0]->pScreen, xf86GPUScreens[i]->pScreen);
  
@@ -45,11 +43,9 @@ index d231ced..89629c1 100644
      xf86VGAarbiterWrapFunctions();
      if (sigio_blocked)
          OsReleaseSIGIO();
-diff --git a/hw/xfree86/common/xf86platformBus.c b/hw/xfree86/common/xf86platformBus.c
-index 0525e39..82fef32 100644
 --- a/hw/xfree86/common/xf86platformBus.c
 +++ b/hw/xfree86/common/xf86platformBus.c
-@@ -387,6 +387,8 @@ xf86platformProbeDev(DriverPtr drvp)
+@@ -401,6 +401,8 @@ xf86platformProbeDev(DriverPtr drvp)
      return foundScreen;
  }
  
@@ -58,19 +54,17 @@ index 0525e39..82fef32 100644
  int
  xf86platformAddDevice(int index)
  {
-@@ -446,6 +448,7 @@ xf86platformAddDevice(int index)
- 
+@@ -473,6 +475,7 @@ xf86platformAddDevice(int index)
+    }
     /* attach unbound to 0 protocol screen */
     AttachUnboundGPU(xf86Screens[0]->pScreen, xf86GPUScreens[i]->pScreen);
 +   xf86AutoConfigOutputDevice(xf86GPUScreens[i], xf86Screens[0]);
  
-    return 0;
- }
-diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c
-index 3011f13..34c1848 100644
+    RRResourcesChanged(xf86Screens[0]->pScreen);
+    RRTellChanged(xf86Screens[0]->pScreen);
 --- a/hw/xfree86/modes/xf86Crtc.c
 +++ b/hw/xfree86/modes/xf86Crtc.c
-@@ -3323,3 +3323,35 @@ xf86DetachAllCrtc(ScrnInfoPtr scrn)
+@@ -3383,3 +3383,35 @@ xf86DetachAllCrtc(ScrnInfoPtr scrn)
              crtc->x = crtc->y = 0;
          }
  }
@@ -106,6 +100,3 @@ index 3011f13..34c1848 100644
 +        slave_config->randr_provider->output_source = master_provider;
 +    }
 +}
--- 
-1.8.1
-