summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorVi0L02017-05-31 20:36:56 +0200
committerVi0L02017-05-31 20:36:56 +0200
commitc35afa513b36819f78debab5e95c4ff07b4d8a8f (patch)
treead1825a3600575131d532373f490f93d963bd14c
parent3bf74bb0e557a2f745aff8c0d139435e9dc36873 (diff)
downloadaur-c35afa513b36819f78debab5e95c4ff07b4d8a8f.tar.gz
15.9-19: 4.11 kernel support
-rw-r--r--.SRCINFO6
-rw-r--r--4.11-npfeiler-signal_vmf.patch66
-rw-r--r--PKGBUILD13
3 files changed, 78 insertions, 7 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 3673a55a3aa..b06413c4e8f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = catalyst-total
pkgdesc = AMD/ATI Catalyst drivers for linux. catalyst-dkms + catalyst-utils + lib32-catalyst-utils + experimental powerXpress suppport. Radeons HD 2 3 4 xxx ARE NOT SUPPORTED
pkgver = 15.9
- pkgrel = 18
+ pkgrel = 19
url = http://www.amd.com
install = catalyst-total.install
arch = i686
@@ -9,7 +9,7 @@ pkgbase = catalyst-total
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
@@ -90,6 +90,7 @@ pkgbase = catalyst-total
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 = af7fb8ee4fc96fd54c5b483e33dc71c4
md5sums = bdafe749e046bfddee2d1c5e90eabd83
@@ -119,6 +120,7 @@ pkgbase = catalyst-total
md5sums = 37eef5103a11d8136979463e7bc31091
md5sums = 194cb44e9e2ab0e65b6267aca66d0400
md5sums = 05f6364db877d9c4bdf1592deda905b7
+ md5sums = 8e53ba65a0aad42eb2ff771c1ace6609
pkgname = catalyst-total
diff --git a/4.11-npfeiler-signal_vmf.patch b/4.11-npfeiler-signal_vmf.patch
new file mode 100644
index 00000000000..b123e4c8b97
--- /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 ef335ad314b..9e6a0897702 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -22,20 +22,20 @@
# Contributor: gentoo (part of 4.3 kernel patches)
# Contributor: Philip Muller @ Manjaro (4.4 kernel patch)
# Contributor: aslmaswd (acpi main script)
-# Contributor: npfeiler (libcl/opencl-icd-loader cleaning)
+# Contributor: npfeiler (libcl/opencl-icd-loader cleaning and 4.11 kernel patch)
# Contributor: sling00 (4.10 kernel patch)
pkgname=catalyst-total
pkgver=15.9
-pkgrel=18
+pkgrel=19
_amdver=15.201.1151
pkgdesc="AMD/ATI Catalyst drivers for linux. catalyst-dkms + catalyst-utils + lib32-catalyst-utils + experimental powerXpress suppport. Radeons HD 2 3 4 xxx ARE NOT SUPPORTED"
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'
@@ -98,7 +98,8 @@ source=(
makesh-dont-check-gcc-version.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'
'af7fb8ee4fc96fd54c5b483e33dc71c4'
@@ -128,7 +129,8 @@ md5sums=('d2de2df6946b452c266a3c892e6e46ff'
'10829e3b992b3e80a6e78c8e27748703'
'37eef5103a11d8136979463e7bc31091'
'194cb44e9e2ab0e65b6267aca66d0400'
- '05f6364db877d9c4bdf1592deda905b7')
+ '05f6364db877d9c4bdf1592deda905b7'
+ '8e53ba65a0aad42eb2ff771c1ace6609')
build() {
@@ -321,6 +323,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