15.12-15: 4.11 kernel support

3 files changed, 80 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index eb8b18ebd79d..61fe41cfbcb8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = catalyst-test
 	pkgdesc = AMD/ATI Catalyst drivers for linux AKA Crimson. catalyst-dkms + catalyst-utils + lib32-catalyst-utils + experimental powerXpress suppport. PRE-GCN Radeons are optionally supported
 	pkgver = 15.12
-	pkgrel = 14
+	pkgrel = 15
 	url = http://www.amd.com
 	install = catalyst-test.install
 	arch = i686
@@ -9,7 +9,7 @@ pkgbase = catalyst-test
 	license = custom
 	depends = dkms
 	depends = linux>=3.0
-	depends = linux<4.11
+	depends = linux<4.12
 	depends = linux-headers
 	depends = xorg-server>=1.7.0
 	depends = xorg-server<1.18.0
@@ -59,6 +59,7 @@ pkgbase = catalyst-test
 	conflicts = libegl
 	conflicts = opencl-amd
 	conflicts = libglvnd
+	conflicts = catalyst-control
 	options = staticlibs
 	options = libtool
 	options = !strip
@@ -92,6 +93,7 @@ pkgbase = catalyst-test
 	source = 4.9_over_4.6-arch-get_user_pages_remote.patch
 	source = catalyst-15.9_control_file.tar.gz
 	source = 4.10-arch-sling00-virtual_address-acpi_get_table_with_size.patch
+	source = 4.11-npfeiler-signal_vmf.patch
 	md5sums = 39808c8a9bcc9041f1305e3531b60622
 	md5sums = af7fb8ee4fc96fd54c5b483e33dc71c4
 	md5sums = bdafe749e046bfddee2d1c5e90eabd83
@@ -121,6 +123,7 @@ pkgbase = catalyst-test
 	md5sums = 194cb44e9e2ab0e65b6267aca66d0400
 	md5sums = e98e50bebe96b08ca680aed6ca505356
 	md5sums = 05f6364db877d9c4bdf1592deda905b7
+	md5sums = 8e53ba65a0aad42eb2ff771c1ace6609
 
 pkgname = catalyst-test
 
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 469d3d73481e..ce99801ff955 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -24,6 +24,7 @@
 # Contributor: aslmaswd (acpi main script)
 # Contributor: npfeiler (libcl/opencl-icd-loader cleaning)
 # Contributor: sling00 (4.10 kernel patch)
+# Contributor: npfeiler (4.11 kernel patch)
 
 
 _old_control=n #for pre-GCN users who has problems with default config, pick =y to enable catalyst 15.9 control file
@@ -31,7 +32,7 @@ _old_control=n #for pre-GCN users who has problems with default config, pick =y
 
 pkgname=catalyst-test
 pkgver=15.12
-pkgrel=14
+pkgrel=15
 # _betano=1.0
 _amdver=15.302
 pkgdesc="AMD/ATI Catalyst drivers for linux AKA Crimson. catalyst-dkms + catalyst-utils + lib32-catalyst-utils + experimental powerXpress suppport. PRE-GCN Radeons are optionally supported"
@@ -39,14 +40,14 @@ arch=('i686' 'x86_64')
 url="http://www.amd.com"
 license=('custom')
 options=('staticlibs' 'libtool' '!strip' '!upx')
-depends=('dkms' 'linux>=3.0' 'linux<4.11' 'linux-headers' 'xorg-server>=1.7.0' 'xorg-server<1.18.0' 'libxrandr' 'libsm' 'fontconfig' 'libxcursor' 'libxi' 'gcc-libs' 'gcc>4.0.0' 'make' 'patch' 'libxinerama' 'mesa-noglvnd')
+depends=('dkms' 'linux>=3.0' 'linux<4.12' 'linux-headers' 'xorg-server>=1.7.0' 'xorg-server<1.18.0' 'libxrandr' 'libsm' 'fontconfig' 'libxcursor' 'libxi' 'gcc-libs' 'gcc>4.0.0' 'make' 'patch' 'libxinerama' 'mesa-noglvnd')
 optdepends=('qt4: to run ATi Catalyst Control Center (amdcccle)'
 	    'libxxf86vm: to run ATi Catalyst Control Center (amdcccle)'
 	    'opencl-headers: headers necessary for OpenCL development'
 	    'acpid: acpi event support  / atieventsd'
 	    'procps-ng: brings pgrep used in acpi event support'
 	    'opencl-icd-loader: OpenCL ICD Bindings')
-conflicts=('libgl' 'catalyst' 'catalyst-daemon' 'catalyst-generator' 'catalyst-hook' 'catalyst-utils' 'catalyst-dkms' 'opencl-catalyst' 'mesa-libgl' 'mesa-libgl-git' 'libgles' 'libegl' 'opencl-amd' 'libglvnd')
+conflicts=('libgl' 'catalyst' 'catalyst-daemon' 'catalyst-generator' 'catalyst-hook' 'catalyst-utils' 'catalyst-dkms' 'opencl-catalyst' 'mesa-libgl' 'mesa-libgl-git' 'libgles' 'libegl' 'opencl-amd' 'libglvnd' 'catalyst-control')
 provides=('libgl' "libatical=${pkgver}" "catalyst=${pkgver}" "catalyst-utils=${pkgver}" "catalyst-dkms=${pkgver}" "catalyst-hook=${pkgver}" "catalyst-libgl=${pkgver}" "opencl-catalyst=${pkgver}" 'dri' 'libtxc_dxtn' 'mesa-libgl' 'mesa-libgl-git' 'opencl-driver' 'libgles' 'libegl')
 
 if [ "${CARCH}" = "x86_64" ]; then
@@ -102,7 +103,8 @@ source=(
     4.7-arch-cpu_has_pge-v2.patch
     4.9_over_4.6-arch-get_user_pages_remote.patch
     catalyst-15.9_control_file.tar.gz
-    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=('39808c8a9bcc9041f1305e3531b60622'
 	 'af7fb8ee4fc96fd54c5b483e33dc71c4'
@@ -132,7 +134,8 @@ md5sums=('39808c8a9bcc9041f1305e3531b60622'
 	 '37eef5103a11d8136979463e7bc31091'
 	 '194cb44e9e2ab0e65b6267aca66d0400'
 	 'e98e50bebe96b08ca680aed6ca505356'
-	 '05f6364db877d9c4bdf1592deda905b7')
+	 '05f6364db877d9c4bdf1592deda905b7'
+	 '8e53ba65a0aad42eb2ff771c1ace6609')
 
 
 build() {
@@ -328,6 +331,7 @@ package() {
       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
 
     # Prepare modules source files
       install -dm755 ${pkgdir}/usr/src/fglrx-${pkgver}/2.6.x