5.1 kernel support

3 files changed, 84 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6517a1a4efd5..7ed123841893 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,7 @@
-# Generated by mksrcinfo v8
-# Sun Mar 24 21:27:03 UTC 2019
 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 = 29
+	pkgrel = 30
 	url = http://www.amd.com
 	install = catalyst-test.install
 	arch = i686
@@ -11,7 +9,7 @@ pkgbase = catalyst-test
 	license = custom
 	depends = dkms
 	depends = linux>=5.0
-	depends = linux<5.1
+	depends = linux<5.2
 	depends = linux-headers
 	depends = xorg-server>=1.7.0
 	depends = xorg-server<1.18.0
@@ -26,12 +24,17 @@ pkgbase = catalyst-test
 	depends = patch
 	depends = libxinerama
 	depends = mesa-noglvnd
+	depends = lib32-libxext
+	depends = lib32-libdrm
+	depends = lib32-libxinerama
+	depends = lib32-mesa-noglvnd
 	optdepends = qt4: to run ATi Catalyst Control Center (amdcccle)
 	optdepends = libxxf86vm: to run ATi Catalyst Control Center (amdcccle)
 	optdepends = opencl-headers: headers necessary for OpenCL development
 	optdepends = acpid: acpi event support / atieventsd
 	optdepends = procps-ng: brings pgrep used in acpi event support
 	optdepends = opencl-icd-loader: OpenCL ICD Bindings
+	optdepends = lib32-opencl-icd-loader: OpenCL ICD Bindings (32-bit)
 	provides = libgl
 	provides = libatical=15.12
 	provides = catalyst=15.12
@@ -47,6 +50,17 @@ pkgbase = catalyst-test
 	provides = opencl-driver
 	provides = libgles
 	provides = libegl
+	provides = lib32-libgl
+	provides = lib32-catalyst-utils=15.12
+	provides = lib32-catalyst-libgl=15.12
+	provides = lib32-opencl-catalyst=15.12
+	provides = lib32-dri
+	provides = lib32-libtxc_dxtn
+	provides = lib32-mesa-libgl
+	provides = lib32-mesa-libgl-git
+	provides = lib32-opencl-driver
+	provides = lib32-libgles
+	provides = lib32-libegl
 	conflicts = libgl
 	conflicts = catalyst
 	conflicts = catalyst-daemon
@@ -62,6 +76,15 @@ pkgbase = catalyst-test
 	conflicts = opencl-amd
 	conflicts = libglvnd
 	conflicts = catalyst-control
+	conflicts = lib32-libgl
+	conflicts = lib32-catalyst-utils
+	conflicts = lib32-opencl-catalyst
+	conflicts = lib32-mesa-libgl
+	conflicts = lib32-mesa-libgl-git
+	conflicts = lib32-libgles
+	conflicts = lib32-libegl
+	conflicts = lib32-opencl-amd
+	conflicts = lib32-libglvnd
 	options = staticlibs
 	options = libtool
 	options = !strip
@@ -104,6 +127,7 @@ pkgbase = catalyst-test
 	source = 4.17-npfeiler-pci_get_domain_bus_and_slot.patch
 	source = 4.20-npfeiler-libfglrx_ip.patch
 	source = 5.0-npfeiler.patch
+	source = 5.1-npfeiler.patch
 	md5sums = 39808c8a9bcc9041f1305e3531b60622
 	md5sums = af7fb8ee4fc96fd54c5b483e33dc71c4
 	md5sums = bdafe749e046bfddee2d1c5e90eabd83
@@ -143,6 +167,7 @@ pkgbase = catalyst-test
 	md5sums = 7ed6e1cf3a9719e6a9874e6a18f29bfb
 	md5sums = 3ca961ceefbc4ddc0eb21452cba79c6c
 	md5sums = 61e709ce66c0479fe3aff7245c71a382
+	md5sums = ff894855bfd17a477363398de8eaeac9
 
 pkgname = catalyst-test
 
diff --git a/5.1-npfeiler.patch b/5.1-npfeiler.patch
new file mode 100644
index 000000000000..0de5229d3bdc
--- /dev/null
+++ b/5.1-npfeiler.patch
@@ -0,0 +1,47 @@
+--- archive_files/common/lib/modules/fglrx/build_mod/firegl_public.c

++++ archive_files/common/lib/modules/fglrx/build_mod/firegl_public.c

+@@ -212,6 +212,10 @@

+ #include <asm/set_memory.h>

+ #endif

+ 

++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,1,0)

++#include <uapi/linux/mman.h>// MAP_SHARED

++#endif

++

+ #include "firegl_public.h"

+ #include "kcl_osconfig.h"

+ #include "kcl_io.h"

+@@ -4262,22 +4266,28 @@ static vm_nopage_ret_t ip_vm_gart_nopage(struct vm_area_struct* vma,

+ 

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

+ 

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

++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,1,0)

++typedef unsigned int ip_vm_ret;

++#else

++typedef int ip_vm_ret;

++#endif

++

++static ip_vm_ret 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) {

++static ip_vm_ret 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) {

++static ip_vm_ret 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) {

++static ip_vm_ret 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) {

++static ip_vm_ret 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) {

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

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

+ }
\ No newline at end of file
diff --git a/PKGBUILD b/PKGBUILD
index 07853ae8a45b..f4ebd807af40 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -24,13 +24,13 @@
 # Contributor: aslmaswd (acpi main script)
 # Contributor: npfeiler (libcl/opencl-icd-loader cleaning)
 # Contributor: sling00 (4.10 kernel patch)
-# Contributor: npfeiler (4.11, 4.12, 4.13, 4.14, 4.15.5, 4.17, 4.20 and 5.0 kernel patch)
+# Contributor: npfeiler (4.11, 4.12, 4.13, 4.14, 4.15.5, 4.17, 4.20, 5.0 and 5.1 kernel patch)
 
 _old_control=n #for pre-GCN users who has problems with default config, pick =y to use control file and opencl runtime from catalyst 15.9
 
 pkgname=catalyst-test
 pkgver=15.12
-pkgrel=29
+pkgrel=30
 # _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"
@@ -38,7 +38,7 @@ arch=('i686' 'x86_64')
 url="http://www.amd.com"
 license=('custom')
 options=('staticlibs' 'libtool' '!strip')
-depends=('dkms' 'linux>=5.0' 'linux<5.1' '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>=5.0' 'linux<5.2' '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'
@@ -111,7 +111,8 @@ source=(
 	4.14.21_4.15.5-npfeiler-flush_tlb_one_kernel.patch
 	4.17-npfeiler-pci_get_domain_bus_and_slot.patch
 	4.20-npfeiler-libfglrx_ip.patch
-	5.0-npfeiler.patch)
+	5.0-npfeiler.patch
+	5.1-npfeiler.patch)
 
 md5sums=('39808c8a9bcc9041f1305e3531b60622'
          'af7fb8ee4fc96fd54c5b483e33dc71c4'
@@ -151,7 +152,8 @@ md5sums=('39808c8a9bcc9041f1305e3531b60622'
          '10af58c21e4e972115dda6dbd8279594'
          '7ed6e1cf3a9719e6a9874e6a18f29bfb'
          '3ca961ceefbc4ddc0eb21452cba79c6c'
-         '61e709ce66c0479fe3aff7245c71a382')
+         '61e709ce66c0479fe3aff7245c71a382'
+		 'ff894855bfd17a477363398de8eaeac9')
 
 if [ "${_old_control}" = "y" ]; then
 	source+=(https://www2.ati.com/drivers/linux/amd-catalyst-15.9-linux-installer-15.201.1151-x86.x86_64.zip)
@@ -195,6 +197,7 @@ prepare() {
 	patch -Np1 -i ../4.17-npfeiler-pci_get_domain_bus_and_slot.patch
 	patch -Np1 -i ../4.20-npfeiler-libfglrx_ip.patch
 	patch -Np1 -i ../5.0-npfeiler.patch
+	patch -Np1 -i ../5.1-npfeiler.patch
 
 	cd ${srcdir}/archive_files/common
 	patch -Np2 -i ${srcdir}/arch-fglrx-authatieventsd_new.patch