15.12-25: 4.17 kernel support

3 files changed, 38 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2c1ed2da3714..dec0b7c60d54 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Sun Apr 29 16:10:26 UTC 2018
+# Sun Jul  1 19:47:38 UTC 2018
 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 = 24
+	pkgrel = 25
 	url = http://www.amd.com
 	install = catalyst-test.install
 	arch = i686
@@ -11,7 +11,7 @@ pkgbase = catalyst-test
 	license = custom
 	depends = dkms
 	depends = linux>=3.0
-	depends = linux<4.17
+	depends = linux<4.18
 	depends = linux-headers
 	depends = xorg-server>=1.7.0
 	depends = xorg-server<1.18.0
@@ -65,7 +65,6 @@ pkgbase = catalyst-test
 	options = staticlibs
 	options = libtool
 	options = !strip
-	options = !upx
 	source = https://www2.ati.com/drivers/linux/radeon-crimson-15.12-15.302-151217a-297685e.zip
 	source = lib32-catalyst.sh
 	source = catalyst.sh
@@ -102,6 +101,7 @@ pkgbase = catalyst-test
 	source = 4.13-npfeiler-wait_queue_t.patch
 	source = 4.14-npfeiler-task_struct-mm_segment_t.patch
 	source = 4.14.21_4.15.5-npfeiler-flush_tlb_one_kernel.patch
+	source = 4.17-npfeiler-pci_get_domain_bus_and_slot.patch
 	md5sums = 39808c8a9bcc9041f1305e3531b60622
 	md5sums = af7fb8ee4fc96fd54c5b483e33dc71c4
 	md5sums = bdafe749e046bfddee2d1c5e90eabd83
@@ -138,6 +138,7 @@ pkgbase = catalyst-test
 	md5sums = 0a725f40bc980d578cbed3e57a05b765
 	md5sums = 5ba3bf9f58aa63c1849b056cf23022c9
 	md5sums = 10af58c21e4e972115dda6dbd8279594
+	md5sums = 7ed6e1cf3a9719e6a9874e6a18f29bfb
 
 pkgname = catalyst-test
 
diff --git a/4.17-npfeiler-pci_get_domain_bus_and_slot.patch b/4.17-npfeiler-pci_get_domain_bus_and_slot.patch
new file mode 100644
index 000000000000..e27f2a4ee460
--- /dev/null
+++ b/4.17-npfeiler-pci_get_domain_bus_and_slot.patch
@@ -0,0 +1,24 @@
+--- archive_files/common/lib/modules/fglrx/build_mod/kcl_pci.c	2018-07-01 21:02:02.000000000 +0200
++++ archive_files2/common/lib/modules/fglrx/build_mod/kcl_pci.c	2018-07-01 21:05:54.346745135 +0200
+@@ -59,7 +59,9 @@
+ {
+     struct pci_dev* pci_dev;
+ 
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,23)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,17,0)
++	pci_dev = pci_get_domain_bus_and_slot(0, busnum, PCI_DEVFN(devnum, funcnum));
++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,23)
+     pci_dev = pci_get_bus_and_slot(busnum, PCI_DEVFN(devnum, funcnum));
+ #else
+     pci_dev = pci_find_slot(busnum, PCI_DEVFN(devnum, funcnum));
+@@ -96,7 +98,9 @@
+ KCL_PCI_DevHandle ATI_API_CALL KCL_PCI_GetDevHandle(
+     KCL_TYPE_U32 bus, KCL_TYPE_U32 slot)
+ {
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,23)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,17,0)
++    return (KCL_PCI_DevHandle)pci_get_domain_bus_and_slot(0, bus, slot);
++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,23)
+     return (KCL_PCI_DevHandle)pci_get_bus_and_slot(bus, slot);
+ #else
+     return (KCL_PCI_DevHandle)pci_find_slot(bus, slot);
diff --git a/PKGBUILD b/PKGBUILD
index a41ae46a276d..9340bd0ba744 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -24,21 +24,21 @@
 # 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 and 4.15.5 kernel patch)
+# Contributor: npfeiler (4.11, 4.12, 4.13, 4.14, 4.15.5 and 4.17 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=24
+pkgrel=25
 # _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"
 arch=('i686' 'x86_64')
 url="http://www.amd.com"
 license=('custom')
-options=('staticlibs' 'libtool' '!strip' '!upx')
-depends=('dkms' 'linux>=3.0' 'linux<4.17' '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')
+options=('staticlibs' 'libtool' '!strip')
+depends=('dkms' 'linux>=3.0' 'linux<4.18' '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'
@@ -108,7 +108,8 @@ source=(
 	4.12-npfeiler-movsl_mask.patch
 	4.13-npfeiler-wait_queue_t.patch
 	4.14-npfeiler-task_struct-mm_segment_t.patch
-	4.14.21_4.15.5-npfeiler-flush_tlb_one_kernel.patch)
+	4.14.21_4.15.5-npfeiler-flush_tlb_one_kernel.patch
+	4.17-npfeiler-pci_get_domain_bus_and_slot.patch)
 
 md5sums=('39808c8a9bcc9041f1305e3531b60622'
 	'af7fb8ee4fc96fd54c5b483e33dc71c4'
@@ -145,7 +146,8 @@ md5sums=('39808c8a9bcc9041f1305e3531b60622'
 	'cb25bc7fbb7d5cb1c07d2f3fa5fda826'
 	'0a725f40bc980d578cbed3e57a05b765'
 	'5ba3bf9f58aa63c1849b056cf23022c9'
-	'10af58c21e4e972115dda6dbd8279594')
+	'10af58c21e4e972115dda6dbd8279594'
+	'7ed6e1cf3a9719e6a9874e6a18f29bfb')
 
 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)
@@ -186,6 +188,7 @@ prepare() {
 	patch -Np1 -i ../4.13-npfeiler-wait_queue_t.patch
 	patch -Np1 -i ../4.14-npfeiler-task_struct-mm_segment_t.patch
 	patch -Np1 -i ../4.14.21_4.15.5-npfeiler-flush_tlb_one_kernel.patch
+	patch -Np1 -i ../4.17-npfeiler-pci_get_domain_bus_and_slot.patch
 
 	cd ${srcdir}/archive_files/common
 	patch -Np2 -i ${srcdir}/arch-fglrx-authatieventsd_new.patch