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

diff --git a/debian/patches/drm_device_keep_trying.patch b/debian/patches/drm_device_keep_trying.patch
index 8a8f920..34051a1 100644
--- a/debian/patches/drm_device_keep_trying.patch
+++ b/debian/patches/drm_device_keep_trying.patch
@@ -21,7 +21,7 @@ Signed-off-by: Bryce Harrington <bryce@canonical.com>
 
 --- a/config/udev.c
 +++ b/config/udev.c
-@@ -98,7 +98,7 @@
+@@ -98,7 +98,7 @@ device_added(struct udev_device *udev_de
          if (strncmp(sysname, "card", 4) != 0)
              return;
  
@@ -30,7 +30,7 @@ Signed-off-by: Bryce Harrington <bryce@canonical.com>
  
          config_udev_odev_setup_attribs(path, syspath, NewGPUDeviceRequest);
          return;
-@@ -430,11 +430,23 @@
+@@ -430,11 +430,23 @@ config_udev_fini(void)
  #ifdef CONFIG_UDEV_KMS
  
  static Bool
@@ -54,7 +54,7 @@ Signed-off-by: Bryce Harrington <bryce@canonical.com>
  
      if (!attribs)
          return FALSE;
-@@ -447,6 +459,33 @@
+@@ -447,6 +459,33 @@ config_udev_odev_setup_attribs(const cha
      if (ret == FALSE)
          goto fail;
  
@@ -135,7 +135,7 @@ Signed-off-by: Bryce Harrington <bryce@canonical.com>
  Bool
  xf86PlatformDeviceCheckBusID(struct xf86_platform_device *device, const char *busid)
  {
-@@ -105,11 +67,6 @@
+@@ -105,11 +67,6 @@ xf86PlatformReprobeDevice(int index, str
      char *dpath;
      dpath = xf86_get_platform_attrib(index, ODEV_ATTRIB_PATH);
  
@@ -147,7 +147,7 @@ Signed-off-by: Bryce Harrington <bryce@canonical.com>
      ret = xf86platformAddDevice(index);
      if (ret == -1)
          xf86_remove_platform_device(index);
-@@ -145,18 +102,10 @@
+@@ -145,18 +102,10 @@ xf86PlatformDeviceProbe(struct OdevAttri
  
      LogMessage(X_INFO, "xfree86: Adding drm device (%s)\n", path);