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

[Patrick Matthäi]

Author: pmatthaei
Date: 2015-09-01 17:07:00 +0000 (Tue, 01 Sep 2015)
New Revision: 1503

Added:
   fglrx-driver/trunk/debian/patches/11-4.1.0-gpl-only.patch
Modified:
   fglrx-driver/trunk/debian/changelog
   fglrx-driver/trunk/debian/patches/series
Log:
* Add patch 11-4.1.0-gpl-only to finaly allow fglrx to build with Linux 4.1.


Modified: fglrx-driver/trunk/debian/changelog
===================================================================
--- fglrx-driver/trunk/debian/changelog	2015-09-01 08:34:36 UTC (rev 1502)
+++ fglrx-driver/trunk/debian/changelog	2015-09-01 17:07:00 UTC (rev 1503)
@@ -1,3 +1,9 @@
+fglrx-driver (1:15.7-3) UNRELEASED; urgency=high
+
+  * Add patch 11-4.1.0-gpl-only to finaly allow fglrx to build with Linux 4.1.
+
+ -- Patrick Matthäi <pmatthaei at debian.org>  Tue, 01 Sep 2015 19:06:22 +0200
+
 fglrx-driver (1:15.7-2) unstable; urgency=high
 
   [ Andreas Beckmann ]

Added: fglrx-driver/trunk/debian/patches/11-4.1.0-gpl-only.patch
===================================================================
--- fglrx-driver/trunk/debian/patches/11-4.1.0-gpl-only.patch	                        (rev 0)
+++ fglrx-driver/trunk/debian/patches/11-4.1.0-gpl-only.patch	2015-09-01 17:07:00 UTC (rev 1503)
@@ -0,0 +1,31 @@
+# Do not use pci_ignore_hotplug which is GPL only.
+
+diff -Naur fglrx-driver-15.7.orig/common/lib/modules/fglrx/build_mod/firegl_public.c fglrx-driver-15.7/common/lib/modules/fglrx/build_mod/firegl_public.c
+--- fglrx-driver-15.7.orig/common/lib/modules/fglrx/build_mod/firegl_public.c	2015-09-01 19:01:13.000000000 +0200
++++ fglrx-driver-15.7/common/lib/modules/fglrx/build_mod/firegl_public.c	2015-09-01 19:02:19.017611171 +0200
+@@ -1117,7 +1117,12 @@
+     // 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)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,1,0)
++	if(pdev)
++	{
++		pdev->ignore_hotplug = 1;
++	}
++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(3,17,0)
+ 	pci_ignore_hotplug(pdev);
+ #endif
+         PMSG_EVENT(pdev->dev.power.power_state) = state;
+diff -Naur fglrx-driver-15.7.orig/common/lib/modules/fglrx/build_mod/kcl_acpi.c fglrx-driver-15.7/common/lib/modules/fglrx/build_mod/kcl_acpi.c
+--- fglrx-driver-15.7.orig/common/lib/modules/fglrx/build_mod/kcl_acpi.c	2015-09-01 19:01:13.000000000 +0200
++++ fglrx-driver-15.7/common/lib/modules/fglrx/build_mod/kcl_acpi.c	2015-09-01 19:02:19.017611171 +0200
+@@ -863,7 +863,7 @@
+ #elif LINUX_VERSION_CODE >= KERNEL_VERSION(3,17,0)
+     if(pdev)
+     {
+-#if LINUX_VERSION_CODE < KERNEL_VERSION(4,1,3)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4,1,0)
+        pci_ignore_hotplug(pdev);
+ #else
+        pdev->ignore_hotplug = 1;

Modified: fglrx-driver/trunk/debian/patches/series
===================================================================
--- fglrx-driver/trunk/debian/patches/series	2015-09-01 08:34:36 UTC (rev 1502)
+++ fglrx-driver/trunk/debian/patches/series	2015-09-01 17:07:00 UTC (rev 1503)
@@ -8,3 +8,4 @@
 08-4.2.0-build.patch
 09-4.2.0-build.fpregs_active.patch
 10-4.2.0-build.copy_xregs_to_kernel.patch
+11-4.1.0-gpl-only.patch