summaryrefslogtreecommitdiff
path: root/x11-drivers/ati-userspace/files
diff options
context:
space:
mode:
Diffstat (limited to 'x11-drivers/ati-userspace/files')
-rw-r--r--x11-drivers/ati-userspace/files/fix-the-linux-3.17-no_hotplug-error.patch18
-rw-r--r--x11-drivers/ati-userspace/files/use-kernel_fpu_begin.patch12
2 files changed, 30 insertions, 0 deletions
diff --git a/x11-drivers/ati-userspace/files/fix-the-linux-3.17-no_hotplug-error.patch b/x11-drivers/ati-userspace/files/fix-the-linux-3.17-no_hotplug-error.patch
new file mode 100644
index 00000000..a8b54625
--- /dev/null
+++ b/x11-drivers/ati-userspace/files/fix-the-linux-3.17-no_hotplug-error.patch
@@ -0,0 +1,18 @@
+--- common/lib/modules/fglrx/build_mod/kcl_acpi.c.orig 2014-07-11 11:46:19.000000000 +0200
++++ common/lib/modules/fglrx/build_mod/kcl_acpi.c 2014-10-08 15:12:55.535638391 +0200
+@@ -829,6 +829,7 @@
+
+ static acpi_status KCL_ACPI_Slot_No_Hotplug(KCL_ACPI_DevHandle handle, u32 lvl, void *data, void **rv)
+ {
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,17,0)
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(3,12,7)
+ struct acpi_device *tdev;
+ struct pci_dev *pdev = (struct pci_dev *)data;
+@@ -844,6 +845,7 @@
+ }
+ }
+ #endif
++#endif
+ return 0;
+ }
+
diff --git a/x11-drivers/ati-userspace/files/use-kernel_fpu_begin.patch b/x11-drivers/ati-userspace/files/use-kernel_fpu_begin.patch
new file mode 100644
index 00000000..f0ba2785
--- /dev/null
+++ b/x11-drivers/ati-userspace/files/use-kernel_fpu_begin.patch
@@ -0,0 +1,12 @@
+diff -Naur a/common/lib/modules/fglrx/build_mod/firegl_public.c b/common/lib/modules/fglrx/build_mod/firegl_public.c
+--- a/common/lib/modules/fglrx/build_mod/firegl_public.c 2014-10-27 23:30:58.630304842 +0200
++++ b/common/lib/modules/fglrx/build_mod/firegl_public.c 2014-10-27 23:32:57.300306011 +0200
+@@ -6389,7 +6389,7 @@
+ */
+ void ATI_API_CALL KCL_fpu_begin(void)
+ {
+-#ifdef CONFIG_X86_64
++#if defined(CONFIG_X86_64) || LINUX_VERSION_CODE >= KERNEL_VERSION(3,17,0)
+ kernel_fpu_begin();
+ #else
+ #ifdef TS_USEDFPU