[packages/xorg-driver-video-fglrx] - proper fix for pci_ignore_hotplug - rel 5

[baggins]

commit 070b2be1832fb36ce6cb53ccfab4af363c020636
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sat Jul 11 13:41:56 2015 +0200

    - proper fix for pci_ignore_hotplug
    - rel 5

 linux-3.17.patch             | 37 -------------------------------------
 linux-3.18.18.patch          | 18 ++++++++++++++++++
 xorg-driver-video-fglrx.spec |  4 ++--
 3 files changed, 20 insertions(+), 39 deletions(-)
---
diff --git a/xorg-driver-video-fglrx.spec b/xorg-driver-video-fglrx.spec
index 63e59c6..df2d5b9 100644
--- a/xorg-driver-video-fglrx.spec
+++ b/xorg-driver-video-fglrx.spec
@@ -31,7 +31,7 @@ exit 1
 %define		betaver		1.0
 #define		rel		0.beta%{betaver}.3
 
-%define		rel		4
+%define		rel		5
 %define		pname		xorg-driver-video-fglrx
 Summary:	Linux Drivers for AMD/ATI graphics accelerators
 Summary(pl.UTF-8):	Sterowniki do akceleratorów graficznych AMD/ATI
@@ -59,7 +59,7 @@ Patch3:		%{pname}-desktop.patch
 Patch4:		%{pname}-nofinger.patch
 Patch5:		%{pname}-GPL-only.patch
 Patch6:		%{pname}-intel_iommu.patch
-Patch7:		linux-3.17.patch
+Patch7:		linux-3.18.18.patch
 Patch8:		linux-3.19.patch
 Patch9:		linux-4.0.patch
 Patch10:	linux-4.1.patch
diff --git a/linux-3.17.patch b/linux-3.17.patch
deleted file mode 100644
index 1ae92e2..0000000
--- a/linux-3.17.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff -uNr 14.9/common/lib/modules/fglrx/build_mod/firegl_public.c 14.9/common/lib/modules/fglrx/build_mod/firegl_public.c
---- 14.9/common/lib/modules/fglrx/build_mod/firegl_public.c	2014-09-09 16:10:17.000000000 +0200
-+++ 14.9/common/lib/modules/fglrx/build_mod/firegl_public.c	2014-09-26 19:01:44.000000000 +0200
-@@ -1093,6 +1093,17 @@
-     // 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);
-+{
-+	struct pci_dev *bridge = pdev->bus->self;
-+
-+	pdev->ignore_hotplug = 1;
-+	/* Propagate the "ignore hotplug" setting to the parent bridge. */
-+	if (bridge)
-+		bridge->ignore_hotplug = 1;
-+}
-+#endif
-         PMSG_EVENT(pdev->dev.power.power_state) = state;
-     }
-     else
-diff -uNr 14.9/common/lib/modules/fglrx/build_mod/kcl_acpi.c 14.9/common/lib/modules/fglrx/build_mod/kcl_acpi.c
---- 14.9/common/lib/modules/fglrx/build_mod/kcl_acpi.c	2014-09-09 16:10:17.000000000 +0200
-+++ 14.9/common/lib/modules/fglrx/build_mod/kcl_acpi.c	2014-09-26 18:57:27.000000000 +0200
-@@ -840,10 +840,12 @@
-    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;
diff --git a/linux-3.18.18.patch b/linux-3.18.18.patch
new file mode 100644
index 0000000..3dcc892
--- /dev/null
+++ b/linux-3.18.18.patch
@@ -0,0 +1,18 @@
+diff -uNr 14.9/common/lib/modules/fglrx/build_mod/kcl_acpi.c 14.9/common/lib/modules/fglrx/build_mod/kcl_acpi.c
+--- 14.9/common/lib/modules/fglrx/build_mod/kcl_acpi.c	2014-09-09 16:10:17.000000000 +0200
++++ 14.9/common/lib/modules/fglrx/build_mod/kcl_acpi.c	2014-09-26 18:57:27.000000000 +0200
+@@ -863,7 +863,13 @@
+ #elif LINUX_VERSION_CODE >= KERNEL_VERSION(3,17,0)
+     if(pdev)
+     {
+-       pci_ignore_hotplug(pdev);
++//	pci_ignore_hotplug(pdev);
++	struct pci_dev *bridge = pdev->bus->self;
++
++	pdev->ignore_hotplug = 1;
++	/* Propagate the "ignore hotplug" setting to the parent bridge. */
++	if (bridge)
++		bridge->ignore_hotplug = 1;
+     }
+ #endif
+ }
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/xorg-driver-video-fglrx.git/commitdiff/070b2be1832fb36ce6cb53ccfab4af363c020636