[patch] ati-drivers-5.7-unified.patch

ati-drivers-5.7-unified.patch (text/plain), 4.30 KB, created by Fernando Rodriguez on 2015-09-13 19:52:16 UTC

--- a/common/lib/modules/fglrx/build_mod/firegl_public.c	2015-05-04 03:16:20.000000000 -0400
+++ b/common/lib/modules/fglrx/build_mod/firegl_public.c	2015-05-04 03:16:53.000000000 -0400
@@ -241,6 +241,13 @@
 #define GET_CPU_VAR(var) __get_cpu_var(var)
 #endif
 
+
+#if LINUX_VERSION_CODE > KERNEL_VERSION(3,18,16)
+#define read_cr4()	__read_cr4()
+#define write_cr4(x)	__write_cr4(x)
+#endif
+
+
 // ============================================================
 /* globals */
 
--- a/common/lib/modules/fglrx/build_mod/firegl_public.c	2015-09-12 17:31:08.000000000 -0400
+++ b/common/lib/modules/fglrx/build_mod/firegl_public.c	2015-09-12 18:39:25.000000000 -0400
@@ -136,7 +136,6 @@
 #include <asm/mman.h>
 #include <asm/uaccess.h>
 #include <asm/processor.h>
-#include <asm/tlbflush.h> // for flush_tlb_page
 #include <asm/cpufeature.h>
 #ifdef CONFIG_MTRR
 #include <asm/mtrr.h>
@@ -249,6 +248,26 @@
 #define write_cr4(x)	__write_cr4(x)
 #endif
 
+#define __flush_tlb_one(addr) asm volatile("invlpg (%0)" ::"r" (addr) : "memory");
+#define __flush_tlb() native_write_cr3(native_read_cr3())
+
+static inline void __flush_tlb_all(void)
+{
+        if (cpu_has_pge)
+	{
+		unsigned long flags, cr4;
+		raw_local_irq_save(flags);
+		cr4 = native_read_cr4();
+		native_write_cr4(cr4 & ~X86_CR4_PGE);
+		native_write_cr4(cr4);
+		raw_local_irq_restore(flags);
+	}
+        else
+	{
+                __flush_tlb();
+	}
+}
+
 
 // ============================================================
 /* globals */
--- a/common/lib/modules/fglrx/build_mod/kcl_acpi.c	2015-09-12 17:47:17.000000000 -0400
+++ b/common/lib/modules/fglrx/build_mod/kcl_acpi.c	2015-09-13 12:20:13.000000000 -0400
@@ -853,7 +853,7 @@ void ATI_API_CALL KCL_ACPI_No_Hotplug(vo
 {
     struct pci_dev  *pdev = (struct pci_dev*)dev;
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,12,7) && LINUX_VERSION_CODE < KERNEL_VERSION(3,17,0)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,12,7) 
     if(pdev && pdev->bus && pdev->bus->bridge)
     {
        acpi_walk_namespace(ACPI_TYPE_DEVICE, ACPI_HANDLE(pdev->bus->bridge), 1, KCL_ACPI_Slot_No_Hotplug, NULL, pdev , NULL);
@@ -861,7 +861,9 @@ void ATI_API_CALL KCL_ACPI_No_Hotplug(vo
 #elif LINUX_VERSION_CODE >= KERNEL_VERSION(3,17,0)
     if(pdev)
     {
-       pci_ignore_hotplug(pdev);
+       pdev->ignore_hotplug = 1;
+       if (pdev->bus->self)
+          pdev->bus->self->ignore_hotplug = 1;
     }
 #endif
 }
--- a/common/lib/modules/fglrx/build_mod/kcl_str.c	2015-09-13 13:47:30.000000000 -0400
+++ b/common/lib/modules/fglrx/build_mod/kcl_str.c	2015-09-13 13:49:42.000000000 -0400
@@ -169,7 +169,11 @@ int ATI_API_CALL KCL_STR_Strnicmp(const
                                   const char* s2,
                                   KCL_TYPE_SizeSigned count)
 {
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,0,0)
     return strnicmp(s1, s2, count);
+#else
+    return strncasecmp(s1, s2, count);
+#endif
 }
 
 /** \brief Locate character in string
--- a/common/lib/modules/fglrx/build_mod/firegl_public.c	2015-09-13 13:55:29.000000000 -0400
+++ b/common/lib/modules/fglrx/build_mod/firegl_public.c	2015-09-13 14:56:24.000000000 -0400
@@ -192,8 +192,13 @@
 #include <linux/string.h>
 #include <linux/gfp.h>
 #include <linux/swap.h>
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,2,0)
 #include "asm/i387.h"
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0)
+#endif
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,2,0)
+#include <asm/fpu/internal.h>
+#define __HAVE_ARCH_CMPXCHG 1
+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0)
 #include <asm/fpu-internal.h>
 #endif
 
@@ -3528,8 +3533,12 @@ int ATI_API_CALL KCL_InstallInterruptHan
 #else
         //when MSI enabled. keep irq disabled when calling the action handler,
         //exclude this IRQ from irq balancing (only on one CPU) 
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,1,0)
+        ((useMSI) ? (IRQF_NOBALANCING) : (IRQF_SHARED)),
+#else
         ((useMSI) ? (IRQF_DISABLED) : (IRQF_SHARED)),    
 #endif
+#endif
         dev_name,
         context);
 }
@@ -6465,7 +6474,7 @@ void ATI_API_CALL KCL_create_uuid(void *
     generate_random_uuid((char *)buf);
 }
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,15,0)
+#if (!defined(CONFIG_X86_64) || LINUX_VERSION_CODE < KERNEL_VERSION(4,2,0)) && LINUX_VERSION_CODE >= KERNEL_VERSION(3,15,0)
 static int KCL_fpu_save_init(struct task_struct *tsk)
 {
    struct fpu *fpu = &tsk->thread.fpu;