15.9-16: 4.11 kernel support

3 files changed, 78 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9b31790ebd16..a44989336a3e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = catalyst
 	pkgdesc = AMD/ATI Catalyst drivers for linux. fglrx kernel module only. Radeons HD 2 3 4 xxx ARE NOT SUPPORTED
 	pkgver = 15.9
-	pkgrel = 15
+	pkgrel = 16
 	url = http://www.amd.com
 	install = catalyst.install
 	arch = i686
@@ -12,7 +12,7 @@ pkgbase = catalyst
 	makedepends = make
 	makedepends = linux-headers
 	depends = linux>=3.0
-	depends = linux<4.11
+	depends = linux<4.12
 	depends = catalyst-utils
 	conflicts = catalyst-test
 	source = http://www2.ati.com/drivers/linux/amd-catalyst-15.9-linux-installer-15.201.1151-x86.x86_64.zip
@@ -31,6 +31,7 @@ pkgbase = catalyst
 	source = 4.7-arch-cpu_has_pge-v2.patch
 	source = 4.9_over_4.6-arch-get_user_pages_remote.patch
 	source = 4.10-arch-sling00-virtual_address-acpi_get_table_with_size.patch
+	source = 4.11-npfeiler-signal_vmf.patch
 	md5sums = d2de2df6946b452c266a3c892e6e46ff
 	md5sums = fd98b7e486d7fd4cad8de7b95b5b031e
 	md5sums = 3e1b82bd69774ea808da69c983d6a43b
@@ -47,6 +48,7 @@ pkgbase = catalyst
 	md5sums = 37eef5103a11d8136979463e7bc31091
 	md5sums = 194cb44e9e2ab0e65b6267aca66d0400
 	md5sums = 05f6364db877d9c4bdf1592deda905b7
+	md5sums = 8e53ba65a0aad42eb2ff771c1ace6609
 
 pkgname = catalyst
 
diff --git a/4.11-npfeiler-signal_vmf.patch b/4.11-npfeiler-signal_vmf.patch
new file mode 100644
index 000000000000..b123e4c8b97f
--- /dev/null
+++ b/4.11-npfeiler-signal_vmf.patch
@@ -0,0 +1,66 @@
+--- archive_files/common/lib/modules/fglrx/build_mod/firegl_public.c.pre	2017-05-25 19:18:22.773622548 +0200

++++ archive_files/common/lib/modules/fglrx/build_mod/firegl_public.c	2017-05-25 19:17:13.929285722 +0200

+@@ -203,6 +203,10 @@

+ #include <asm/fpu/internal.h>

+ #endif

+ #endif

++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,11,0)

++#include <linux/mm.h>

++#include <linux/sched/signal.h>

++#endif

+ 

+ #include "firegl_public.h"

+ #include "kcl_osconfig.h"

+@@ -4196,6 +4200,29 @@

+    return ret;

+ #endif

+ 

++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,11,0)

++

++static int ip_vm_fault(struct vm_fault *vmf) {

++    TRACE_FAULT(do_vm_fault, vmf->vma, vmf);

++}

++static int ip_vm_shm_fault(struct vm_fault *vmf) {

++    TRACE_FAULT(do_vm_shm_fault, vmf->vma, vmf);

++}

++static int ip_vm_dma_fault(struct vm_fault *vmf) {

++    TRACE_FAULT(do_vm_dma_fault, vmf->vma, vmf);

++}

++static int ip_vm_kmap_fault(struct vm_fault *vmf) {

++    TRACE_FAULT(do_vm_kmap_fault, vmf->vma, vmf);

++}

++static int ip_vm_pcie_fault(struct vm_fault *vmf) {

++    TRACE_FAULT(do_vm_pcie_fault, vmf->vma, vmf);

++}

++static int ip_vm_gart_fault(struct vm_fault *vmf) {

++    TRACE_FAULT(do_vm_gart_fault, vmf->vma, vmf);

++}

++

++#else /* LINUX_VERSION_CODE >= KERNEL_VERSION(4,11,0) */

++

+ static int ip_vm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)

+ {

+     TRACE_FAULT(do_vm_fault, vma, vmf);

+@@ -4226,6 +4253,8 @@

+     TRACE_FAULT(do_vm_gart_fault, vma, vmf);

+ }

+ 

++#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(4,11,0) */

++

+ #endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26) */

+ 

+ static struct vm_operations_struct vm_ops =

+--- archive_files/common/lib/modules/fglrx/build_mod/kcl.c.pre	2017-05-25 19:18:22.776955783 +0200

++++ archive_files/common/lib/modules/fglrx/build_mod/kcl.c	2017-05-25 19:18:19.697047011 +0200

+@@ -30,6 +30,11 @@

+ #include <linux/slab.h>

+ #include <linux/pci.h>

+ 

++#include <linux/version.h>

++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,11,0)

++#include <linux/sched/signal.h>

++#endif

++

+ #define SUSPEND_CONSOLE  (MAX_NR_CONSOLES-1)

+ 

+ /** \brief Send signal to a specified pid
\ No newline at end of file
diff --git a/PKGBUILD b/PKGBUILD
index d3764f591291..579034aae2f5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,19 +11,20 @@
 # Contributor: gentoo (part of 4.3 kernel patches)
 # Contributor: Philip Muller @ Manjaro (4.4 kernel patch)
 # Contributor: sling00 (4.10 kernel patch)
+# Contributor: npfeiler (4.11 kernel patch)
 
 
 _kernver=`uname -r`
 
 pkgname=catalyst
 pkgver=15.9
-pkgrel=15
+pkgrel=16
 _amdver=15.201.1151
 pkgdesc="AMD/ATI Catalyst drivers for linux. fglrx kernel module only. Radeons HD 2 3 4 xxx ARE NOT SUPPORTED"
 arch=('i686' 'x86_64')
 url="http://www.amd.com"
 license=('custom')
-depends=('linux>=3.0' 'linux<4.11' 'catalyst-utils')
+depends=('linux>=3.0' 'linux<4.12' 'catalyst-utils')
 makedepends=('gcc-libs' 'gcc>4.0.0' 'make' 'linux-headers')
 conflicts=('catalyst-test')
 install=catalyst.install
@@ -47,7 +48,8 @@ source=(
     4.6-arch-get_user_pages-page_cache_release.patch
     4.7-arch-cpu_has_pge-v2.patch
     4.9_over_4.6-arch-get_user_pages_remote.patch
-    4.10-arch-sling00-virtual_address-acpi_get_table_with_size.patch)
+    4.10-arch-sling00-virtual_address-acpi_get_table_with_size.patch
+    4.11-npfeiler-signal_vmf.patch)
 
 md5sums=('d2de2df6946b452c266a3c892e6e46ff'
 	 'fd98b7e486d7fd4cad8de7b95b5b031e'
@@ -64,7 +66,8 @@ md5sums=('d2de2df6946b452c266a3c892e6e46ff'
 	 '11b7c2e0dc4794801005d66b0e7608a3'
 	 '37eef5103a11d8136979463e7bc31091'
 	 '194cb44e9e2ab0e65b6267aca66d0400'
-	 '05f6364db877d9c4bdf1592deda905b7')
+	 '05f6364db877d9c4bdf1592deda905b7'
+	 '8e53ba65a0aad42eb2ff771c1ace6609')
 
 
 build() {
@@ -101,6 +104,7 @@ build() {
       patch -Np1 -i ../4.7-arch-cpu_has_pge-v2.patch
       patch -Np1 -i ../4.9_over_4.6-arch-get_user_pages_remote.patch
       patch -Np1 -i ../4.10-arch-sling00-virtual_address-acpi_get_table_with_size.patch
+      patch -Np1 -i ../4.11-npfeiler-signal_vmf.patch
 
       cd ${srcdir}/archive_files/common/lib/modules/fglrx/build_mod
       cp ${srcdir}/archive_files/arch/${_archdir}/lib/modules/fglrx/build_mod/libfglrx_ip.a .