[Pkg-fglrx-devel] r1463 - in fglrx-driver/trunk/debian: . patches

[Andreas Beckmann]

Author: anbe
Date: 2015-01-24 18:17:31 +0000 (Sat, 24 Jan 2015)
New Revision: 1463

Added:
   fglrx-driver/trunk/debian/patches/fglrx_3.17rc6-no_hotplug.patch
Modified:
   fglrx-driver/trunk/debian/changelog
   fglrx-driver/trunk/debian/patches/series
Log:
add support for Linux >= 3.17

Modified: fglrx-driver/trunk/debian/changelog
===================================================================
--- fglrx-driver/trunk/debian/changelog	2015-01-24 14:53:48 UTC (rev 1462)
+++ fglrx-driver/trunk/debian/changelog	2015-01-24 18:17:31 UTC (rev 1463)
@@ -1,3 +1,10 @@
+fglrx-driver (1:14.12-2) UNRELEASED; urgency=medium
+
+  * fglrx_3.17rc6-no_hotplug.patch: New patch, add support for Linux >= 3.17.
+    Found in the kanotix package.  (Closes: #768397)
+
+ -- Andreas Beckmann <anbe at debian.org>  Sat, 24 Jan 2015 19:53:38 +0100
+
 fglrx-driver (1:14.12-1) experimental; urgency=medium
 
   * New upstream release 14.12 (2014-12-09) (14.501.1003).  (Closes: #764523)

Added: fglrx-driver/trunk/debian/patches/fglrx_3.17rc6-no_hotplug.patch
===================================================================
--- fglrx-driver/trunk/debian/patches/fglrx_3.17rc6-no_hotplug.patch	                        (rev 0)
+++ fglrx-driver/trunk/debian/patches/fglrx_3.17rc6-no_hotplug.patch	2015-01-24 18:17:31 UTC (rev 1463)
@@ -0,0 +1,31 @@
+Index: fglrx-driver-14.12/common/lib/modules/fglrx/build_mod/firegl_public.c
+===================================================================
+--- fglrx-driver-14.12.orig/common/lib/modules/fglrx/build_mod/firegl_public.c
++++ fglrx-driver-14.12/common/lib/modules/fglrx/build_mod/firegl_public.c
+@@ -1093,6 +1093,9 @@ static int fglrx_pci_suspend(struct pci_
+     // directly here to allow suspend/resume without X server start. 
+         firegl_pci_save_state((KCL_PCI_DevHandle)pdev, privdev);
+         pci_disable_device(pdev);
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,17,0)
++	pci_ignore_hotplug(pdev);
++#endif
+         PMSG_EVENT(pdev->dev.power.power_state) = state;
+     }
+     else
+Index: fglrx-driver-14.12/common/lib/modules/fglrx/build_mod/kcl_acpi.c
+===================================================================
+--- fglrx-driver-14.12.orig/common/lib/modules/fglrx/build_mod/kcl_acpi.c
++++ fglrx-driver-14.12/common/lib/modules/fglrx/build_mod/kcl_acpi.c
+@@ -840,10 +840,12 @@ static acpi_status KCL_ACPI_Slot_No_Hotp
+    if(tdev != NULL)
+    {
+       device = (acpi_device_adr(tdev) >> 16) & 0xffff;
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,17,0)
+       if(PCI_SLOT(pdev->devfn) == device)
+       {
+          tdev->flags.no_hotplug = true;
+       }
++#endif
+    }
+ #endif
+    return 0;

Modified: fglrx-driver/trunk/debian/patches/series
===================================================================
--- fglrx-driver/trunk/debian/patches/series	2015-01-24 14:53:48 UTC (rev 1462)
+++ fglrx-driver/trunk/debian/patches/series	2015-01-24 18:17:31 UTC (rev 1463)
@@ -1,3 +1,4 @@
 02-dkms-arch_compat.patch
 03-authatieventsd.sh.patch
 06-stub-for-agpless-kernel.patch
+fglrx_3.17rc6-no_hotplug.patch