diff options
| -rw-r--r-- | .SRCINFO | 151 | ||||
| -rw-r--r-- | 0001-add-OS-detection-for-arch.patch | 26 | ||||
| -rw-r--r-- | 0002-update-kcl_ttm_bo_reserve-for-linux-4.7.patch | 25 | ||||
| -rw-r--r-- | 0003-add-kcl_drm_gem_object_lookup.patch | 204 | ||||
| -rw-r--r-- | 0004-paging-changes-for-linux-4.6.patch | 42 | ||||
| -rw-r--r-- | 0005-LRU-stuff-isn-t-available-until-4.7.x.patch | 48 | ||||
| -rw-r--r-- | 0006-Change-name-of-vblank_disable_allowed-to-vblank_disa.patch | 29 | ||||
| -rw-r--r-- | 0007-Remove-connector-parameter-from-__drm_atomic_helper_.patch | 29 | ||||
| -rw-r--r-- | 0008-fix-apparent-typo-in-bandwidth_calcs-causing-array-e.patch | 25 | ||||
| -rw-r--r-- | 0009-disable-dal-by-default.patch | 25 | ||||
| -rw-r--r-- | 0010-remove-dependency-on-System.map.patch | 112 | ||||
| -rw-r--r-- | PKGBUILD | 111 |
12 files changed, 730 insertions, 97 deletions
@@ -1,77 +1,107 @@ pkgbase = amdgpu-pro-installer pkgver = 16.30.3.315407 - pkgrel = 1 + pkgrel = 2 url = http://www.amd.com arch = x86_64 license = custom:AMD makedepends = wget source = https://www2.ati.com/drivers/linux/amdgpu-pro_16.30.3-315407.tar.xz + source = 0001-add-OS-detection-for-arch.patch + source = 0002-update-kcl_ttm_bo_reserve-for-linux-4.7.patch + source = 0003-add-kcl_drm_gem_object_lookup.patch + source = 0004-paging-changes-for-linux-4.6.patch + source = 0005-LRU-stuff-isn-t-available-until-4.7.x.patch + source = 0006-Change-name-of-vblank_disable_allowed-to-vblank_disa.patch + source = 0007-Remove-connector-parameter-from-__drm_atomic_helper_.patch + source = 0008-fix-apparent-typo-in-bandwidth_calcs-causing-array-e.patch + source = 0009-disable-dal-by-default.patch + source = 0010-remove-dependency-on-System.map.patch sha256sums = 97d6fb64617cf2cefe780e5fb83b29d8ee4e3e7886b71fe3d92b0113847b2354 + sha256sums = ae5fed04cd626aadff6d4c7c59657f52a8dd6be3df4a9686702e74aa8c72d1de + sha256sums = df36d1d9f470094432b765016b558624fa9b28355c82a722f7bd4facdf912ce2 + sha256sums = 4afabc203dc52a8ad15f1d4dc62887d1a11472f11c1aa9f9adb8affc183f297b + sha256sums = 0a0657826270a963be76f9e3a882432df4f6ac0628dd0966289cc5c064cadeb6 + sha256sums = fe0075575bae0a7f76daa0686ab23464b867ef8ed0b4d39cec4bd566ec39f99c + sha256sums = a0e94234555f5254df096a93e050edbc341603d0b1d527f7b0c3179e111b7be1 + sha256sums = 2e291935e35ecdc9f7c87d288db9d73a27f4f5cc3b08f95b8b39fef3934c6735 + sha256sums = 50c56c4e2ed55d66e5d5e5689b2f146de63dbb3edc2bafabf5ca98e8ae58e028 + sha256sums = 7e5640468e9ede54a8b3cc8fd67d6c3ae3738aec959a655c9aeaac9570a646f9 + sha256sums = 2f6c74a5a909f27a5a18eae5acf2ca90c99c4f2e4aa8ceb766dbf8a0cb431817 pkgname = amdgpu-pro pkgdesc = This package install all amdgpu-pro components. arch = x86_64 - depends = amdgpu-pro-graphics=16.30.3.315407-1 - depends = amdgpu-pro-computing=16.30.3.315407-1 + depends = amdgpu-pro-graphics=16.30.3.315407-2 + depends = amdgpu-pro-computing=16.30.3.315407-2 pkgname = amdgpu-pro-clinfo pkgdesc = AMD OpenCL info utility arch = x86_64 - depends = amdgpu-pro-libopencl1=16.30.3.315407-1 + depends = amdgpu-pro-libopencl1=16.30.3.315407-2 pkgname = amdgpu-pro-computing pkgdesc = This package install amdgpu-pro OpenCL components. arch = x86_64 - depends = amdgpu-pro-core=16.30.3.315407-1 - depends = amdgpu-pro-clinfo=16.30.3.315407-1 - depends = amdgpu-pro-opencl-icd=16.30.3.315407-1 - depends = amdgpu-pro-libopencl-dev=16.30.3.315407-1 + depends = amdgpu-pro-core=16.30.3.315407-2 + depends = amdgpu-pro-clinfo=16.30.3.315407-2 + depends = amdgpu-pro-opencl-icd=16.30.3.315407-2 + depends = amdgpu-pro-libopencl-dev=16.30.3.315407-2 pkgname = amdgpu-pro-core pkgdesc = This package switchs the GPU stack to amdgpu-pro with basic components. install = amdgpu-pro-core.install arch = x86_64 depends = linux-firmware - depends = libdrm-amdgpu-pro-amdgpu1=16.30.3.315407-1 + depends = libdrm-amdgpu-pro-amdgpu1=16.30.3.315407-2 + +pkgname = amdgpu-pro-dkms + pkgdesc = amdgpu-pro driver in DKMS format. + arch = any + depends = dkms>=1.95 + +pkgname = amdgpu-pro-firmware + pkgdesc = Firmware for amdgpu-pro cards. + arch = x86_64 + depends = pkgname = amdgpu-pro-graphics pkgdesc = This package install amdgpu-pro graphics components. arch = x86_64 - depends = amdgpu-pro-core=16.30.3.315407-1 - depends = libgles2-amdgpu-pro=16.30.3.315407-1 - depends = libgl1-amdgpu-pro-dev=16.30.3.315407-1 - depends = libgl1-amdgpu-pro-dri=16.30.3.315407-1 - depends = xserver-xorg-video-amdgpu-pro=16.30.3.315407-1 - depends = amdgpu-pro-vulkan-driver=16.30.3.315407-1 - depends = libvdpau-amdgpu-pro=16.30.3.315407-1 + depends = amdgpu-pro-core=16.30.3.315407-2 + depends = libgles2-amdgpu-pro=16.30.3.315407-2 + depends = libgl1-amdgpu-pro-dev=16.30.3.315407-2 + depends = libgl1-amdgpu-pro-dri=16.30.3.315407-2 + depends = xserver-xorg-video-amdgpu-pro=16.30.3.315407-2 + depends = amdgpu-pro-vulkan-driver=16.30.3.315407-2 + depends = libvdpau-amdgpu-pro=16.30.3.315407-2 provides = libgl conflicts = libgl pkgname = lib32-amdgpu-pro-lib32 pkgdesc = This package contains x86 libs for x86_64 machine usage. arch = x86_64 - depends = lib32-libgles2-amdgpu-pro=16.30.3.315407-1 - depends = lib32-libgl1-amdgpu-pro-dev=16.30.3.315407-1 - depends = lib32-libgl1-amdgpu-pro-dri=16.30.3.315407-1 - depends = lib32-libgbm1-amdgpu-pro=16.30.3.315407-1 - depends = lib32-amdgpu-pro-opencl-icd=16.30.3.315407-1 - depends = lib32-amdgpu-pro-libopencl-dev=16.30.3.315407-1 - depends = lib32-amdgpu-pro-vulkan-driver=16.30.3.315407-1 - depends = lib32-libvdpau-amdgpu-pro=16.30.3.315407-1 + depends = lib32-libgles2-amdgpu-pro=16.30.3.315407-2 + depends = lib32-libgl1-amdgpu-pro-dev=16.30.3.315407-2 + depends = lib32-libgl1-amdgpu-pro-dri=16.30.3.315407-2 + depends = lib32-libgbm1-amdgpu-pro=16.30.3.315407-2 + depends = lib32-amdgpu-pro-opencl-icd=16.30.3.315407-2 + depends = lib32-amdgpu-pro-libopencl-dev=16.30.3.315407-2 + depends = lib32-amdgpu-pro-vulkan-driver=16.30.3.315407-2 + depends = lib32-libvdpau-amdgpu-pro=16.30.3.315407-2 provides = lib32-libgl conflicts = lib32-libgl pkgname = lib32-amdgpu-pro-libopencl-dev pkgdesc = AMD OpenCL ICD Loader library arch = x86_64 - depends = lib32-amdgpu-pro-libopencl1=16.30.3.315407-1 + depends = lib32-amdgpu-pro-libopencl1=16.30.3.315407-2 provides = lib32-libcl conflicts = lib32-libcl pkgname = amdgpu-pro-libopencl-dev pkgdesc = AMD OpenCL ICD Loader library arch = x86_64 - depends = amdgpu-pro-libopencl1=16.30.3.315407-1 + depends = amdgpu-pro-libopencl1=16.30.3.315407-2 provides = libcl conflicts = libcl @@ -98,40 +128,40 @@ pkgname = lib32-amdgpu-pro-opencl-icd pkgname = amdgpu-pro-vulkan-driver pkgdesc = AMDGPU Pro Vulkan driver arch = x86_64 - depends = libdrm-amdgpu-pro-amdgpu1=16.30.3.315407-1 + depends = libdrm-amdgpu-pro-amdgpu1=16.30.3.315407-2 pkgname = lib32-amdgpu-pro-vulkan-driver pkgdesc = AMDGPU Pro Vulkan driver arch = x86_64 - depends = lib32-libdrm-amdgpu-pro-amdgpu1=16.30.3.315407-1 + depends = lib32-libdrm-amdgpu-pro-amdgpu1=16.30.3.315407-2 pkgname = libdrm-amdgpu-pro-amdgpu1 pkgdesc = Userspace interface to amdgpu-specific kernel DRM services -- runtime arch = x86_64 - depends = libdrm2-amdgpu-pro=16.30.3.315407-1 + depends = libdrm2-amdgpu-pro=16.30.3.315407-2 pkgname = lib32-libdrm-amdgpu-pro-amdgpu1 pkgdesc = Userspace interface to amdgpu-specific kernel DRM services -- runtime arch = x86_64 - depends = lib32-libdrm2-amdgpu-pro=16.30.3.315407-1 + depends = lib32-libdrm2-amdgpu-pro=16.30.3.315407-2 pkgname = lib32-libdrm-amdgpu-pro-dev pkgdesc = Userspace interface to kernel DRM services -- development files arch = x86_64 - depends = lib32-libdrm2-amdgpu-pro=16.30.3.315407-1 - depends = lib32-libdrm-amdgpu-pro-amdgpu1=16.30.3.315407-1 + depends = lib32-libdrm2-amdgpu-pro=16.30.3.315407-2 + depends = lib32-libdrm-amdgpu-pro-amdgpu1=16.30.3.315407-2 pkgname = libdrm-amdgpu-pro-dev pkgdesc = Userspace interface to kernel DRM services -- development files arch = x86_64 - depends = libdrm2-amdgpu-pro=16.30.3.315407-1 - depends = libdrm-amdgpu-pro-amdgpu1=16.30.3.315407-1 + depends = libdrm2-amdgpu-pro=16.30.3.315407-2 + depends = libdrm-amdgpu-pro-amdgpu1=16.30.3.315407-2 pkgname = libdrm-amdgpu-pro-tools pkgdesc = testing tools for libdrm-amdgpu-pro arch = x86_64 - depends = libdrm-amdgpu-pro-amdgpu1=16.30.3.315407-1 - depends = libdrm2-amdgpu-pro=16.30.3.315407-1 + depends = libdrm-amdgpu-pro-amdgpu1=16.30.3.315407-2 + depends = libdrm2-amdgpu-pro=16.30.3.315407-2 pkgname = libdrm2-amdgpu-pro pkgdesc = Userspace interface to kernel DRM services -- runtime @@ -156,44 +186,44 @@ pkgname = lib32-libegl1-amdgpu-pro pkgname = lib32-libegl1-amdgpu-pro-dev pkgdesc = implementation of the EGL API -- development files arch = x86_64 - depends = lib32-libegl1-amdgpu-pro=16.30.3.315407-1 + depends = lib32-libegl1-amdgpu-pro=16.30.3.315407-2 pkgname = libegl1-amdgpu-pro-dev pkgdesc = implementation of the EGL API -- development files arch = x86_64 - depends = libegl1-amdgpu-pro=16.30.3.315407-1 + depends = libegl1-amdgpu-pro=16.30.3.315407-2 pkgname = libgbm-amdgpu-pro-dev pkgdesc = generic buffer management API -- development files arch = x86_64 - depends = libgbm1-amdgpu-pro=16.30.3.315407-1 + depends = libgbm1-amdgpu-pro=16.30.3.315407-2 pkgname = lib32-libgbm-amdgpu-pro-dev pkgdesc = generic buffer management API -- development files arch = x86_64 - depends = lib32-libgbm1-amdgpu-pro=16.30.3.315407-1 + depends = lib32-libgbm1-amdgpu-pro=16.30.3.315407-2 pkgname = libgbm1-amdgpu-pro pkgdesc = generic buffer management API -- runtime arch = x86_64 - depends = libdrm-amdgpu-pro-amdgpu1=16.30.3.315407-1 - depends = libdrm2-amdgpu-pro=16.30.3.315407-1 + depends = libdrm-amdgpu-pro-amdgpu1=16.30.3.315407-2 + depends = libdrm2-amdgpu-pro=16.30.3.315407-2 pkgname = lib32-libgbm1-amdgpu-pro pkgdesc = generic buffer management API -- runtime arch = x86_64 - depends = lib32-libdrm-amdgpu-pro-amdgpu1=16.30.3.315407-1 - depends = lib32-libdrm2-amdgpu-pro=16.30.3.315407-1 + depends = lib32-libdrm-amdgpu-pro-amdgpu1=16.30.3.315407-2 + depends = lib32-libdrm2-amdgpu-pro=16.30.3.315407-2 pkgname = lib32-libgl1-amdgpu-pro-dev pkgdesc = implementation of the OpenGL API -- GLX development files arch = x86_64 - depends = lib32-libgl1-amdgpu-pro-glx=16.30.3.315407-1 + depends = lib32-libgl1-amdgpu-pro-glx=16.30.3.315407-2 pkgname = libgl1-amdgpu-pro-dev pkgdesc = implementation of the OpenGL API -- GLX development files arch = x86_64 - depends = libgl1-amdgpu-pro-glx=16.30.3.315407-1 + depends = libgl1-amdgpu-pro-glx=16.30.3.315407-2 pkgname = lib32-libgl1-amdgpu-pro-dri pkgdesc = implementation of the OpenGL API -- DRI modules @@ -210,7 +240,7 @@ pkgname = libgl1-amdgpu-pro-dri pkgname = libgl1-amdgpu-pro-glx pkgdesc = implementation of the OpenGL API -- GLX runtime arch = x86_64 - depends = libdrm2-amdgpu-pro=16.30.3.315407-1 + depends = libdrm2-amdgpu-pro=16.30.3.315407-2 depends = libx11>=1.4.99.1 depends = libxcb>=1.8 depends = libxcb @@ -224,7 +254,7 @@ pkgname = libgl1-amdgpu-pro-glx pkgname = lib32-libgl1-amdgpu-pro-glx pkgdesc = implementation of the OpenGL API -- GLX runtime arch = x86_64 - depends = lib32-libdrm2-amdgpu-pro=16.30.3.315407-1 + depends = lib32-libdrm2-amdgpu-pro=16.30.3.315407-2 depends = lib32-libx11>=1.4.99.1 depends = lib32-libxcb>=1.8 depends = lib32-libxcb @@ -238,29 +268,29 @@ pkgname = lib32-libgl1-amdgpu-pro-glx pkgname = libgles2-amdgpu-pro pkgdesc = implementation of the OpenGL|ES 2.x API -- runtime arch = x86_64 - depends = libegl1-amdgpu-pro=16.30.3.315407-1 + depends = libegl1-amdgpu-pro=16.30.3.315407-2 pkgname = lib32-libgles2-amdgpu-pro pkgdesc = implementation of the OpenGL|ES 2.x API -- runtime arch = x86_64 - depends = lib32-libegl1-amdgpu-pro=16.30.3.315407-1 + depends = lib32-libegl1-amdgpu-pro=16.30.3.315407-2 pkgname = libgles2-amdgpu-pro-dev pkgdesc = implementation of the OpenGL|ES 2.x API -- development files arch = x86_64 - depends = libgles2-amdgpu-pro=16.30.3.315407-1 + depends = libgles2-amdgpu-pro=16.30.3.315407-2 pkgname = lib32-libgles2-amdgpu-pro-dev pkgdesc = implementation of the OpenGL|ES 2.x API -- development files arch = x86_64 - depends = lib32-libgles2-amdgpu-pro=16.30.3.315407-1 + depends = lib32-libgles2-amdgpu-pro=16.30.3.315407-2 pkgname = lib32-libvdpau-amdgpu-pro pkgdesc = AMDGPU Pro VDPAU driver arch = x86_64 - depends = lib32-libdrm-amdgpu-pro-amdgpu1=16.30.3.315407-1 + depends = lib32-libdrm-amdgpu-pro-amdgpu1=16.30.3.315407-2 depends = lib32-libdrm>=2.4.31 - depends = lib32-libdrm2-amdgpu-pro=16.30.3.315407-1 + depends = lib32-libdrm2-amdgpu-pro=16.30.3.315407-2 depends = lib32-openssl>=1.0.0 depends = lib32-libx11 depends = lib32-libxcb>=1.8 @@ -270,9 +300,9 @@ pkgname = lib32-libvdpau-amdgpu-pro pkgname = libvdpau-amdgpu-pro pkgdesc = AMDGPU Pro VDPAU driver arch = x86_64 - depends = libdrm-amdgpu-pro-amdgpu1=16.30.3.315407-1 + depends = libdrm-amdgpu-pro-amdgpu1=16.30.3.315407-2 depends = libdrm>=2.4.31 - depends = libdrm2-amdgpu-pro=16.30.3.315407-1 + depends = libdrm2-amdgpu-pro=16.30.3.315407-2 depends = openssl>=1.0.0 depends = libx11 depends = libxcb>=1.8 @@ -281,11 +311,11 @@ pkgname = libvdpau-amdgpu-pro pkgname = xserver-xorg-video-amdgpu-pro pkgdesc = X.Org X server -- AMD/ATI Amdgpu-Pro display driver arch = x86_64 - depends = libdrm-amdgpu-pro-amdgpu1=16.30.3.315407-1 - depends = libdrm2-amdgpu-pro=16.30.3.315407-1 + depends = libdrm-amdgpu-pro-amdgpu1=16.30.3.315407-2 + depends = libdrm2-amdgpu-pro=16.30.3.315407-2 depends = libepoxy>=1.0 - depends = libgbm1-amdgpu-pro=16.30.3.315407-1 - depends = libgl1-amdgpu-pro-glx=16.30.3.315407-1 + depends = libgbm1-amdgpu-pro=16.30.3.315407-2 + depends = libgl1-amdgpu-pro-glx=16.30.3.315407-2 depends = libsystemd>=183 depends = libx11 depends = libxcb @@ -294,4 +324,5 @@ pkgname = xserver-xorg-video-amdgpu-pro depends = libxfixes depends = libxxf86vm depends = xorg-server + conflicts = xf86-video-amdgpu diff --git a/0001-add-OS-detection-for-arch.patch b/0001-add-OS-detection-for-arch.patch new file mode 100644 index 000000000000..46302ae0ea89 --- /dev/null +++ b/0001-add-OS-detection-for-arch.patch @@ -0,0 +1,26 @@ +From e78ede724fff53fc0220999f6381242142ce8c33 Mon Sep 17 00:00:00 2001 +From: David McFarland <corngood@gmail.com> +Date: Sun, 21 Aug 2016 16:30:25 -0300 +Subject: [PATCH 1/8] add OS detection for arch + +--- + amd/backport/Makefile | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/amd/backport/Makefile b/amd/backport/Makefile +index 0c285ef..6447a15 100644 +--- a/amd/backport/Makefile ++++ b/amd/backport/Makefile +@@ -17,6 +17,9 @@ else ifeq ("ubuntu",$(OS_NAME)) + ccflags-y += -DOS_NAME_UBUNTU + else ifeq ("steamos",$(OS_NAME)) + ccflags-y += -DOS_NAME_STEAMOS ++else ifeq ("arch",$(OS_NAME)) ++ccflags-y += -DOS_NAME_ARCH ++OS_VERSION = "0.0" + else + ccflags-y += -DOS_NAME_UNKNOWN + endif +-- +2.9.3 + diff --git a/0002-update-kcl_ttm_bo_reserve-for-linux-4.7.patch b/0002-update-kcl_ttm_bo_reserve-for-linux-4.7.patch new file mode 100644 index 000000000000..4101662a4ebe --- /dev/null +++ b/0002-update-kcl_ttm_bo_reserve-for-linux-4.7.patch @@ -0,0 +1,25 @@ +From d84bd62a10308efb6a414e8f6582a7b1e9860638 Mon Sep 17 00:00:00 2001 +From: David McFarland <corngood@gmail.com> +Date: Sun, 21 Aug 2016 16:31:12 -0300 +Subject: [PATCH 2/8] update kcl_ttm_bo_reserve for linux-4.7 + +--- + amd/backport/include/kcl/kcl_ttm.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/amd/backport/include/kcl/kcl_ttm.h b/amd/backport/include/kcl/kcl_ttm.h +index 3575004..0d1560d 100644 +--- a/amd/backport/include/kcl/kcl_ttm.h ++++ b/amd/backport/include/kcl/kcl_ttm.h +@@ -84,7 +84,7 @@ static inline int kcl_ttm_bo_reserve(struct ttm_buffer_object *bo, + bool interruptible, bool no_wait, + struct ww_acquire_ctx *ticket) + { +-#if defined(BUILD_AS_DKMS) ++#if defined(BUILD_AS_DKMS) && LINUX_VERSION_CODE < KERNEL_VERSION(4, 7, 0) + return ttm_bo_reserve(bo, interruptible, no_wait, false, ticket); + #else + return ttm_bo_reserve(bo, interruptible, no_wait, ticket); +-- +2.9.3 + diff --git a/0003-add-kcl_drm_gem_object_lookup.patch b/0003-add-kcl_drm_gem_object_lookup.patch new file mode 100644 index 000000000000..214b8effd9d3 --- /dev/null +++ b/0003-add-kcl_drm_gem_object_lookup.patch @@ -0,0 +1,204 @@ +From 2637dfe990e4c277bc724f6ba48e6661506805ec Mon Sep 17 00:00:00 2001 +From: David McFarland <corngood@gmail.com> +Date: Sun, 21 Aug 2016 16:37:34 -0300 +Subject: [PATCH 3/8] add kcl_drm_gem_object_lookup + +--- + amd/amdgpu/amdgpu_atpx_handler.c | 4 ++++ + amd/amdgpu/amdgpu_bo_list.c | 2 +- + amd/amdgpu/amdgpu_cs.c | 2 +- + amd/amdgpu/amdgpu_display.c | 2 +- + amd/amdgpu/amdgpu_gem.c | 10 +++++----- + amd/amdgpu/dce_v10_0.c | 2 +- + amd/amdgpu/dce_v11_0.c | 2 +- + amd/amdgpu/dce_v8_0.c | 2 +- + amd/backport/include/kcl/kcl_drm.h | 11 +++++++++++ + amd/dal/amdgpu_dm/amdgpu_dm_types.c | 2 +- + 10 files changed, 27 insertions(+), 12 deletions(-) + +diff --git a/amd/amdgpu/amdgpu_atpx_handler.c b/amd/amdgpu/amdgpu_atpx_handler.c +index cc9b998..7e47478 100644 +--- a/amd/amdgpu/amdgpu_atpx_handler.c ++++ b/amd/amdgpu/amdgpu_atpx_handler.c +@@ -565,7 +565,11 @@ void amdgpu_register_atpx_handler(void) + if (!r) + return; + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 6, 0) ++ vga_switcheroo_register_handler(&amdgpu_atpx_handler, 0); ++#else + vga_switcheroo_register_handler(&amdgpu_atpx_handler); ++#endif + } + + /** +diff --git a/amd/amdgpu/amdgpu_bo_list.c b/amd/amdgpu/amdgpu_bo_list.c +index 35d0856..1d163ec 100644 +--- a/amd/amdgpu/amdgpu_bo_list.c ++++ b/amd/amdgpu/amdgpu_bo_list.c +@@ -106,7 +106,7 @@ static int amdgpu_bo_list_set(struct amdgpu_device *adev, + struct amdgpu_bo *bo; + struct mm_struct *usermm; + +- gobj = drm_gem_object_lookup(adev->ddev, filp, info[i].bo_handle); ++ gobj = kcl_drm_gem_object_lookup(adev->ddev, filp, info[i].bo_handle); + if (!gobj) { + r = -ENOENT; + goto error_free; +diff --git a/amd/amdgpu/amdgpu_cs.c b/amd/amdgpu/amdgpu_cs.c +index d16ed26..b0390b5 100644 +--- a/amd/amdgpu/amdgpu_cs.c ++++ b/amd/amdgpu/amdgpu_cs.c +@@ -92,7 +92,7 @@ static int amdgpu_cs_user_fence_chunk(struct amdgpu_cs_parser *p, + { + struct drm_gem_object *gobj; + +- gobj = drm_gem_object_lookup(p->adev->ddev, p->filp, ++ gobj = kcl_drm_gem_object_lookup(p->adev->ddev, p->filp, + data->handle); + if (gobj == NULL) + return -EINVAL; +diff --git a/amd/amdgpu/amdgpu_display.c b/amd/amdgpu/amdgpu_display.c +index 46326b3..9b5441f 100644 +--- a/amd/amdgpu/amdgpu_display.c ++++ b/amd/amdgpu/amdgpu_display.c +@@ -594,7 +594,7 @@ amdgpu_user_framebuffer_create(struct drm_device *dev, + struct amdgpu_framebuffer *amdgpu_fb; + int ret; + +- obj = drm_gem_object_lookup(dev, file_priv, mode_cmd->handles[0]); ++ obj = kcl_drm_gem_object_lookup(dev, file_priv, mode_cmd->handles[0]); + if (obj == NULL) { + dev_err(&dev->pdev->dev, "No GEM object associated to handle 0x%08X, " + "can't create framebuffer\n", mode_cmd->handles[0]); +diff --git a/amd/amdgpu/amdgpu_gem.c b/amd/amdgpu/amdgpu_gem.c +index 0069aec..d10c282 100644 +--- a/amd/amdgpu/amdgpu_gem.c ++++ b/amd/amdgpu/amdgpu_gem.c +@@ -397,7 +397,7 @@ int amdgpu_mode_dumb_mmap(struct drm_file *filp, + struct drm_gem_object *gobj; + struct amdgpu_bo *robj; + +- gobj = drm_gem_object_lookup(dev, filp, handle); ++ gobj = kcl_drm_gem_object_lookup(dev, filp, handle); + if (gobj == NULL) { + return -ENOENT; + } +@@ -461,7 +461,7 @@ int amdgpu_gem_wait_idle_ioctl(struct drm_device *dev, void *data, + int r = 0; + long ret; + +- gobj = drm_gem_object_lookup(dev, filp, handle); ++ gobj = kcl_drm_gem_object_lookup(dev, filp, handle); + if (gobj == NULL) { + return -ENOENT; + } +@@ -495,7 +495,7 @@ int amdgpu_gem_metadata_ioctl(struct drm_device *dev, void *data, + int r = -1; + + DRM_DEBUG("%d \n", args->handle); +- gobj = drm_gem_object_lookup(dev, filp, args->handle); ++ gobj = kcl_drm_gem_object_lookup(dev, filp, args->handle); + if (gobj == NULL) + return -ENOENT; + robj = gem_to_amdgpu_bo(gobj); +@@ -643,7 +643,7 @@ int amdgpu_gem_va_ioctl(struct drm_device *dev, void *data, + return -EINVAL; + } + +- gobj = drm_gem_object_lookup(dev, filp, args->handle); ++ gobj = kcl_drm_gem_object_lookup(dev, filp, args->handle); + if (gobj == NULL) + return -ENOENT; + rbo = gem_to_amdgpu_bo(gobj); +@@ -705,7 +705,7 @@ int amdgpu_gem_op_ioctl(struct drm_device *dev, void *data, + struct amdgpu_bo *robj; + int r; + +- gobj = drm_gem_object_lookup(dev, filp, args->handle); ++ gobj = kcl_drm_gem_object_lookup(dev, filp, args->handle); + if (gobj == NULL) { + return -ENOENT; + } +diff --git a/amd/amdgpu/dce_v10_0.c b/amd/amdgpu/dce_v10_0.c +index 7554dd7..6d38754 100644 +--- a/amd/amdgpu/dce_v10_0.c ++++ b/amd/amdgpu/dce_v10_0.c +@@ -2594,7 +2594,7 @@ static int dce_v10_0_crtc_cursor_set2(struct drm_crtc *crtc, + return -EINVAL; + } + +- obj = drm_gem_object_lookup(crtc->dev, file_priv, handle); ++ obj = kcl_drm_gem_object_lookup(crtc->dev, file_priv, handle); + if (!obj) { + DRM_ERROR("Cannot find cursor object %x for crtc %d\n", handle, amdgpu_crtc->crtc_id); + return -ENOENT; +diff --git a/amd/amdgpu/dce_v11_0.c b/amd/amdgpu/dce_v11_0.c +index d9c9b88..93dbc1a 100644 +--- a/amd/amdgpu/dce_v11_0.c ++++ b/amd/amdgpu/dce_v11_0.c +@@ -2604,7 +2604,7 @@ static int dce_v11_0_crtc_cursor_set2(struct drm_crtc *crtc, + return -EINVAL; + } + +- obj = drm_gem_object_lookup(crtc->dev, file_priv, handle); ++ obj = kcl_drm_gem_object_lookup(crtc->dev, file_priv, handle); + if (!obj) { + DRM_ERROR("Cannot find cursor object %x for crtc %d\n", handle, amdgpu_crtc->crtc_id); + return -ENOENT; +diff --git a/amd/amdgpu/dce_v8_0.c b/amd/amdgpu/dce_v8_0.c +index 7a027ce..c56a298 100644 +--- a/amd/amdgpu/dce_v8_0.c ++++ b/amd/amdgpu/dce_v8_0.c +@@ -2501,7 +2501,7 @@ static int dce_v8_0_crtc_cursor_set2(struct drm_crtc *crtc, + return -EINVAL; + } + +- obj = drm_gem_object_lookup(crtc->dev, file_priv, handle); ++ obj = kcl_drm_gem_object_lookup(crtc->dev, file_priv, handle); + if (!obj) { + DRM_ERROR("Cannot find cursor object %x for crtc %d\n", handle, amdgpu_crtc->crtc_id); + return -ENOENT; +diff --git a/amd/backport/include/kcl/kcl_drm.h b/amd/backport/include/kcl/kcl_drm.h +index a65ee25..5a8a7b3 100644 +--- a/amd/backport/include/kcl/kcl_drm.h ++++ b/amd/backport/include/kcl/kcl_drm.h +@@ -3,6 +3,7 @@ + + #include <linux/version.h> + #include <drm/drmP.h> ++#include <drm/drm_gem.h> + + #if defined(BUILD_AS_DKMS) + extern int drm_pcie_get_max_link_width(struct drm_device *dev, u32 *mlw); +@@ -123,4 +124,14 @@ static inline int kcl_drm_universal_plane_init(struct drm_device *dev, struct dr + #endif + } + ++static inline struct drm_gem_object *kcl_drm_gem_object_lookup(struct drm_device *dev, ++ struct drm_file *filp, ++ u32 handle) { ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0) ++ return drm_gem_object_lookup(filp, handle); ++#else ++ return drm_gem_object_lookup(dev, filp, handle); ++#endif ++} ++ + #endif /* AMDGPU_BACKPORT_KCL_DRM_H */ +diff --git a/amd/dal/amdgpu_dm/amdgpu_dm_types.c b/amd/dal/amdgpu_dm/amdgpu_dm_types.c +index 3f357a5..2e2d2e6 100644 +--- a/amd/dal/amdgpu_dm/amdgpu_dm_types.c ++++ b/amd/dal/amdgpu_dm/amdgpu_dm_types.c +@@ -152,7 +152,7 @@ static int dm_crtc_pin_cursor_bo_new( + + amdgpu_crtc = to_amdgpu_crtc(crtc); + +- obj = drm_gem_object_lookup(crtc->dev, file_priv, handle); ++ obj = kcl_drm_gem_object_lookup(crtc->dev, file_priv, handle); + + if (!obj) { + DRM_ERROR( +-- +2.9.3 + diff --git a/0004-paging-changes-for-linux-4.6.patch b/0004-paging-changes-for-linux-4.6.patch new file mode 100644 index 000000000000..54394b7879be --- /dev/null +++ b/0004-paging-changes-for-linux-4.6.patch @@ -0,0 +1,42 @@ +From 2bd83488ccea22bb9e399986c171cccc3b6beb93 Mon Sep 17 00:00:00 2001 +From: David McFarland <corngood@gmail.com> +Date: Sun, 21 Aug 2016 16:40:32 -0300 +Subject: [PATCH 4/8] paging changes for linux-4.6 + +--- + amd/amdgpu/amdgpu_ttm.c | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) + +diff --git a/amd/amdgpu/amdgpu_ttm.c b/amd/amdgpu/amdgpu_ttm.c +index 7bdebde..8b676c2 100644 +--- a/amd/amdgpu/amdgpu_ttm.c ++++ b/amd/amdgpu/amdgpu_ttm.c +@@ -548,8 +548,12 @@ int amdgpu_ttm_tt_get_user_pages(struct ttm_tt *ttm, struct page **pages) + list_add(&guptask.list, >t->guptasks); + spin_unlock(>t->guptasklock); + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 6, 0) ++ r = get_user_pages(userptr, num_pages, write, 0, p, NULL); ++#else + r = get_user_pages(current, current->mm, userptr, num_pages, +- write, 0, p, NULL); ++ write, 0, p, NULL); ++#endif + + spin_lock(>t->guptasklock); + list_del(&guptask.list); +@@ -625,7 +629,11 @@ static void amdgpu_ttm_tt_unpin_userptr(struct ttm_tt *ttm) + set_page_dirty(page); + + mark_page_accessed(page); ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 6, 0) ++ put_page(page); ++#else + page_cache_release(page); ++#endif + } + + sg_free_table(ttm->sg); +-- +2.9.3 + diff --git a/0005-LRU-stuff-isn-t-available-until-4.7.x.patch b/0005-LRU-stuff-isn-t-available-until-4.7.x.patch new file mode 100644 index 000000000000..6da3e46a3ee6 --- /dev/null +++ b/0005-LRU-stuff-isn-t-available-until-4.7.x.patch @@ -0,0 +1,48 @@ +From c41c15fa04e363c41272e7b5d767710170691347 Mon Sep 17 00:00:00 2001 +From: "Luke A. Guest" <laguest@archeia.com> +Date: Mon, 4 Jul 2016 19:19:45 +0100 +Subject: [PATCH 5/8] LRU stuff isn't available until >= 4.7.x + +--- + amd/amdgpu/amdgpu_ttm.c | 4 ++-- + amd/backport/kcl_ttm.c | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/amd/amdgpu/amdgpu_ttm.c b/amd/amdgpu/amdgpu_ttm.c +index 8b676c2..752d065 100644 +--- a/amd/amdgpu/amdgpu_ttm.c ++++ b/amd/amdgpu/amdgpu_ttm.c +@@ -907,7 +907,7 @@ uint32_t amdgpu_ttm_tt_pte_flags(struct amdgpu_device *adev, struct ttm_tt *ttm, + return flags; + } + +-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 0) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0) + + static void amdgpu_ttm_lru_removal(struct ttm_buffer_object *tbo) + { +@@ -969,7 +969,7 @@ static struct ttm_bo_driver amdgpu_bo_driver = { + .fault_reserve_notify = &amdgpu_bo_fault_reserve_notify, + .io_mem_reserve = &amdgpu_ttm_io_mem_reserve, + .io_mem_free = &amdgpu_ttm_io_mem_free, +-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 0) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0) + .lru_removal = &amdgpu_ttm_lru_removal, + .lru_tail = &amdgpu_ttm_lru_tail, + .swap_lru_tail = &amdgpu_ttm_swap_lru_tail, +diff --git a/amd/backport/kcl_ttm.c b/amd/backport/kcl_ttm.c +index 24f7a83..1a2cb7b 100644 +--- a/amd/backport/kcl_ttm.c ++++ b/amd/backport/kcl_ttm.c +@@ -7,7 +7,7 @@ static int _kcl_ttm_bo_del_from_lru(struct ttm_buffer_object *bo) + { + int put_count = 0; + +-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 0) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0) + struct ttm_bo_device *bdev = bo->bdev; + + if (bdev->driver->lru_removal) +-- +2.9.3 + diff --git a/0006-Change-name-of-vblank_disable_allowed-to-vblank_disa.patch b/0006-Change-name-of-vblank_disable_allowed-to-vblank_disa.patch new file mode 100644 index 000000000000..5be5acad00d6 --- /dev/null +++ b/0006-Change-name-of-vblank_disable_allowed-to-vblank_disa.patch @@ -0,0 +1,29 @@ +From 5b90b8d8ab44637c707623b25ee98aa4ebded308 Mon Sep 17 00:00:00 2001 +From: "Luke A. Guest" <laguest@archeia.com> +Date: Mon, 4 Jul 2016 19:30:08 +0100 +Subject: [PATCH 6/8] Change name of vblank_disable_allowed to + vblank_disable_immediate under 4.7.x. + +--- + amd/amdgpu/amdgpu_irq.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/amd/amdgpu/amdgpu_irq.c b/amd/amdgpu/amdgpu_irq.c +index d13865a..5cfa69f 100644 +--- a/amd/amdgpu/amdgpu_irq.c ++++ b/amd/amdgpu/amdgpu_irq.c +@@ -240,7 +240,11 @@ int amdgpu_irq_init(struct amdgpu_device *adev) + INIT_WORK(&adev->hotplug_work, + amdgpu_hotplug_work_func); + } ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0) ++ adev->ddev->vblank_disable_immediate = true; ++#else + adev->ddev->vblank_disable_allowed = true; ++#endif + + INIT_WORK(&adev->reset_work, amdgpu_irq_reset_work_func); + +-- +2.9.3 + diff --git a/0007-Remove-connector-parameter-from-__drm_atomic_helper_.patch b/0007-Remove-connector-parameter-from-__drm_atomic_helper_.patch new file mode 100644 index 000000000000..13d4a282ac82 --- /dev/null +++ b/0007-Remove-connector-parameter-from-__drm_atomic_helper_.patch @@ -0,0 +1,29 @@ +From 27ef2ce0d4d8eeb3bca32ddeae503f0a334832aa Mon Sep 17 00:00:00 2001 +From: "Luke A. Guest" <laguest@archeia.com> +Date: Mon, 4 Jul 2016 19:41:08 +0100 +Subject: [PATCH 7/8] Remove connector parameter from + __drm_atomic_helper_connector_destroy_state for 4.7.x kernels. + +--- + amd/dal/amdgpu_dm/amdgpu_dm_types.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/amd/dal/amdgpu_dm/amdgpu_dm_types.c b/amd/dal/amdgpu_dm/amdgpu_dm_types.c +index 2e2d2e6..cd34607 100644 +--- a/amd/dal/amdgpu_dm/amdgpu_dm_types.c ++++ b/amd/dal/amdgpu_dm/amdgpu_dm_types.c +@@ -1205,7 +1205,11 @@ void amdgpu_dm_connector_atomic_destroy_state( + struct dm_connector_state *dm_state = + to_dm_connector_state(state); + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0) ++ __drm_atomic_helper_connector_destroy_state(state); ++#else + __drm_atomic_helper_connector_destroy_state(connector, state); ++#endif + + kfree(dm_state); + } +-- +2.9.3 + diff --git a/0008-fix-apparent-typo-in-bandwidth_calcs-causing-array-e.patch b/0008-fix-apparent-typo-in-bandwidth_calcs-causing-array-e.patch new file mode 100644 index 000000000000..693ad8b2f40d --- /dev/null +++ b/0008-fix-apparent-typo-in-bandwidth_calcs-causing-array-e.patch @@ -0,0 +1,25 @@ +From c9f2501131da0d9173e21f7e8ff5741a7fcfedb6 Mon Sep 17 00:00:00 2001 +From: David McFarland <corngood@gmail.com> +Date: Sun, 21 Aug 2016 16:58:45 -0300 +Subject: [PATCH 8/8] fix apparent typo in bandwidth_calcs causing array error + +--- + amd/dal/dc/calcs/bandwidth_calcs.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/amd/dal/dc/calcs/bandwidth_calcs.c b/amd/dal/dc/calcs/bandwidth_calcs.c +index 8a19139..c4ededd 100644 +--- a/amd/dal/dc/calcs/bandwidth_calcs.c ++++ b/amd/dal/dc/calcs/bandwidth_calcs.c +@@ -3181,7 +3181,7 @@ static void calculate_bandwidth( + bw_int_to_fixed( + 2), + vbios->mcifwrmc_urgent_latency), +- results->dmif_burst_time[i][j]), ++ results->dmif_burst_time[results->y_clk_level][results->sclk_level]), + results->mcifwr_burst_time[results->y_clk_level][results->sclk_level])), + results->dispclk), + bw_int_to_fixed( +-- +2.9.3 + diff --git a/0009-disable-dal-by-default.patch b/0009-disable-dal-by-default.patch new file mode 100644 index 000000000000..05bcbf8bd061 --- /dev/null +++ b/0009-disable-dal-by-default.patch @@ -0,0 +1,25 @@ +From 49d45957ddaafe13a9cc7bacd1b9665fe9c517ac Mon Sep 17 00:00:00 2001 +From: David McFarland <corngood@gmail.com> +Date: Thu, 25 Aug 2016 22:17:06 -0300 +Subject: [PATCH] disable dal by default + +--- + amd/amdgpu/amdgpu_drv.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/amd/amdgpu/amdgpu_drv.c b/amd/amdgpu/amdgpu_drv.c +index 793528b..9a4dfcc 100644 +--- a/amd/amdgpu/amdgpu_drv.c ++++ b/amd/amdgpu/amdgpu_drv.c +@@ -79,7 +79,7 @@ int amdgpu_vm_block_size = -1; + int amdgpu_vm_fault_stop = 0; + int amdgpu_vm_debug = 0; + int amdgpu_exp_hw_support = 0; +-int amdgpu_dal = -1; ++int amdgpu_dal = 0; + int amdgpu_sched_jobs = 32; + int amdgpu_sched_hw_submission = 2; + int amdgpu_powerplay = -1; +-- +2.9.3 + diff --git a/0010-remove-dependency-on-System.map.patch b/0010-remove-dependency-on-System.map.patch new file mode 100644 index 000000000000..ec8f2c5a5999 --- /dev/null +++ b/0010-remove-dependency-on-System.map.patch @@ -0,0 +1,112 @@ +From fbc0d704f47526ca38f518b60237962cc6b08305 Mon Sep 17 00:00:00 2001 +From: David McFarland <corngood@gmail.com> +Date: Thu, 25 Aug 2016 23:08:02 -0300 +Subject: [PATCH] remove dependency on System.map + +--- + amd/backport/Makefile | 3 +-- + amd/backport/kcl_fence.c | 10 ++++++++-- + amd/backport/symbols | 3 --- + dkms.conf | 1 - + pre-build.sh | 32 -------------------------------- + 5 files changed, 9 insertions(+), 40 deletions(-) + delete mode 100644 amd/backport/symbols + delete mode 100755 pre-build.sh + +diff --git a/amd/backport/Makefile b/amd/backport/Makefile +index 6447a15..4682e0f 100644 +--- a/amd/backport/Makefile ++++ b/amd/backport/Makefile +@@ -53,10 +53,9 @@ ccflags-y += -DOS_NAME_RHEL_7 + endif + endif + +-BACKPORT_OBJS = symbols.o + endif + +-BACKPORT_OBJS += kcl_drm.o kcl_ttm.o kcl_amdgpu.o kcl_fence.o kcl_mn.o ++BACKPORT_OBJS = kcl_drm.o kcl_ttm.o kcl_amdgpu.o kcl_fence.o kcl_mn.o + + amdgpu-y += $(addprefix ../backport/,$(BACKPORT_OBJS)) + +diff --git a/amd/backport/kcl_fence.c b/amd/backport/kcl_fence.c +index 2141eef..ceef1fe 100644 +--- a/amd/backport/kcl_fence.c ++++ b/amd/backport/kcl_fence.c +@@ -22,8 +22,14 @@ struct default_wait_cb { + struct task_struct *task; + }; + +-extern void +-(*fence_default_wait_cb)(struct fence *fence, struct fence_cb *cb); ++static void ++fence_default_wait_cb(struct fence *fence, struct fence_cb *cb) ++{ ++ struct default_wait_cb *wait = ++ container_of(cb, struct default_wait_cb, base); ++ ++ wake_up_process(wait->task); ++} + + signed long + _kcl_fence_wait_any_timeout(struct fence **fences, uint32_t count, +diff --git a/amd/backport/symbols b/amd/backport/symbols +deleted file mode 100644 +index 2d3f2ee..0000000 +--- a/amd/backport/symbols ++++ /dev/null +@@ -1,3 +0,0 @@ +-SYMS="" +- +-SYMS+="fence_default_wait_cb" +diff --git a/dkms.conf b/dkms.conf +index 9ca148e..36be480 100644 +--- a/dkms.conf ++++ b/dkms.conf +@@ -4,4 +4,3 @@ BUILT_MODULE_NAME[0]="amdgpu" + BUILT_MODULE_LOCATION[0]="amd/amdgpu" + DEST_MODULE_LOCATION[0]="/extra" + AUTOINSTALL="yes" +-PRE_BUILD="pre-build.sh $kernelver" +\ No newline at end of file +diff --git a/pre-build.sh b/pre-build.sh +deleted file mode 100755 +index 88ec680..0000000 +--- a/pre-build.sh ++++ /dev/null +@@ -1,32 +0,0 @@ +-#!/bin/bash +- +-KERNELVER=$1 +-KERNELVER_BASE=${KERNELVER%%-*} +- +-version_lt () { +- newest=$((echo "$1"; echo "$2") | sort -V | tail -n1) +- [ "$1" != "$newest" ] +-} +- +-version_ge () { +- newest=$((echo "$1"; echo "$2") | sort -V | tail -n1) +- [ "$1" = "$newest" ] +-} +- +-version_gt () { +- oldest=$((echo "$1"; echo "$2") | sort -V | head -n1) +- [ "$1" != "$oldest" ] +-} +- +-version_le () { +- oldest=$((echo "$1"; echo "$2") | sort -V | head -n1) +- [ "$1" = "$oldest" ] +-} +- +-source amd/backport/symbols +- +-echo '// auto generated by DKMS pre-build.sh' > amd/backport/symbols.c +-for sym in $SYMS; do +- addr=$(grep $sym /boot/System.map-$KERNELVER | awk -F' ' '{print $1}') +- echo "void *$sym = (void *)0x$addr;" >> amd/backport/symbols.c +-done +-- +2.9.3 + @@ -3,12 +3,12 @@ # Autogenerated from AMD's Packages file pkgbase=amdgpu-pro-installer -pkgname=(amdgpu-pro amdgpu-pro-clinfo amdgpu-pro-computing amdgpu-pro-core amdgpu-pro-graphics lib32-amdgpu-pro-lib32 lib32-amdgpu-pro-libopencl-dev amdgpu-pro-libopencl-dev amdgpu-pro-libopencl1 lib32-amdgpu-pro-libopencl1 amdgpu-pro-opencl-icd lib32-amdgpu-pro-opencl-icd amdgpu-pro-vulkan-driver lib32-amdgpu-pro-vulkan-driver libdrm-amdgpu-pro-amdgpu1 lib32-libdrm-amdgpu-pro-amdgpu1 lib32-libdrm-amdgpu-pro-dev libdrm-amdgpu-pro-dev libdrm-amdgpu-pro-tools libdrm2-amdgpu-pro lib32-libdrm2-amdgpu-pro libegl1-amdgpu-pro lib32-libegl1-amdgpu-pro lib32-libegl1-amdgpu-pro-dev libegl1-amdgpu-pro-dev libgbm-amdgpu-pro-dev lib32-libgbm-amdgpu-pro-dev libgbm1-amdgpu-pro lib32-libgbm1-amdgpu-pro lib32-libgl1-amdgpu-pro-dev libgl1-amdgpu-pro-dev lib32-libgl1-amdgpu-pro-dri libgl1-amdgpu-pro-dri libgl1-amdgpu-pro-glx lib32-libgl1-amdgpu-pro-glx libgles2-amdgpu-pro lib32-libgles2-amdgpu-pro libgles2-amdgpu-pro-dev lib32-libgles2-amdgpu-pro-dev lib32-libvdpau-amdgpu-pro libvdpau-amdgpu-pro xserver-xorg-video-amdgpu-pro) +pkgname=(amdgpu-pro amdgpu-pro-clinfo amdgpu-pro-computing amdgpu-pro-core amdgpu-pro-dkms amdgpu-pro-firmware amdgpu-pro-graphics lib32-amdgpu-pro-lib32 lib32-amdgpu-pro-libopencl-dev amdgpu-pro-libopencl-dev amdgpu-pro-libopencl1 lib32-amdgpu-pro-libopencl1 amdgpu-pro-opencl-icd lib32-amdgpu-pro-opencl-icd amdgpu-pro-vulkan-driver lib32-amdgpu-pro-vulkan-driver libdrm-amdgpu-pro-amdgpu1 lib32-libdrm-amdgpu-pro-amdgpu1 lib32-libdrm-amdgpu-pro-dev libdrm-amdgpu-pro-dev libdrm-amdgpu-pro-tools libdrm2-amdgpu-pro lib32-libdrm2-amdgpu-pro libegl1-amdgpu-pro lib32-libegl1-amdgpu-pro lib32-libegl1-amdgpu-pro-dev libegl1-amdgpu-pro-dev libgbm-amdgpu-pro-dev lib32-libgbm-amdgpu-pro-dev libgbm1-amdgpu-pro lib32-libgbm1-amdgpu-pro lib32-libgl1-amdgpu-pro-dev libgl1-amdgpu-pro-dev lib32-libgl1-amdgpu-pro-dri libgl1-amdgpu-pro-dri libgl1-amdgpu-pro-glx lib32-libgl1-amdgpu-pro-glx libgles2-amdgpu-pro lib32-libgles2-amdgpu-pro libgles2-amdgpu-pro-dev lib32-libgles2-amdgpu-pro-dev lib32-libvdpau-amdgpu-pro libvdpau-amdgpu-pro xserver-xorg-video-amdgpu-pro) if [ "$ALL_PACKAGES" = "true" ]; then - pkgname+=(amdgpu-pro-dkms amdgpu-pro-firmware) + pkgname+=() fi pkgver=16.30.3.315407 -pkgrel=1 +pkgrel=2 arch=('x86_64') url='http://www.amd.com' license=('custom:AMD') @@ -16,13 +16,33 @@ makedepends=('wget') DLAGENTS='https::/usr/bin/wget --referer http://support.amd.com/en-us/kb-articles/Pages/AMDGPU-PRO-Beta-Driver-for-Vulkan-Release-Notes.aspx -N %u' -source=('https://www2.ati.com/drivers/linux/amdgpu-pro_16.30.3-315407.tar.xz') -sha256sums=('97d6fb64617cf2cefe780e5fb83b29d8ee4e3e7886b71fe3d92b0113847b2354') +source=(https://www2.ati.com/drivers/linux/amdgpu-pro_16.30.3-315407.tar.xz + 0001-add-OS-detection-for-arch.patch + 0002-update-kcl_ttm_bo_reserve-for-linux-4.7.patch + 0003-add-kcl_drm_gem_object_lookup.patch + 0004-paging-changes-for-linux-4.6.patch + 0005-LRU-stuff-isn-t-available-until-4.7.x.patch + 0006-Change-name-of-vblank_disable_allowed-to-vblank_disa.patch + 0007-Remove-connector-parameter-from-__drm_atomic_helper_.patch + 0008-fix-apparent-typo-in-bandwidth_calcs-causing-array-e.patch + 0009-disable-dal-by-default.patch + 0010-remove-dependency-on-System.map.patch) +sha256sums=(97d6fb64617cf2cefe780e5fb83b29d8ee4e3e7886b71fe3d92b0113847b2354 + ae5fed04cd626aadff6d4c7c59657f52a8dd6be3df4a9686702e74aa8c72d1de + df36d1d9f470094432b765016b558624fa9b28355c82a722f7bd4facdf912ce2 + 4afabc203dc52a8ad15f1d4dc62887d1a11472f11c1aa9f9adb8affc183f297b + 0a0657826270a963be76f9e3a882432df4f6ac0628dd0966289cc5c064cadeb6 + fe0075575bae0a7f76daa0686ab23464b867ef8ed0b4d39cec4bd566ec39f99c + a0e94234555f5254df096a93e050edbc341603d0b1d527f7b0c3179e111b7be1 + 2e291935e35ecdc9f7c87d288db9d73a27f4f5cc3b08f95b8b39fef3934c6735 + 50c56c4e2ed55d66e5d5e5689b2f146de63dbb3edc2bafabf5ca98e8ae58e028 + 7e5640468e9ede54a8b3cc8fd67d6c3ae3738aec959a655c9aeaac9570a646f9 + 2f6c74a5a909f27a5a18eae5acf2ca90c99c4f2e4aa8ceb766dbf8a0cb431817) package_amdgpu-pro () { pkgdesc="This package install all amdgpu-pro components." - depends=('amdgpu-pro-graphics=16.30.3.315407-1' 'amdgpu-pro-computing=16.30.3.315407-1') + depends=('amdgpu-pro-graphics=16.30.3.315407-2' 'amdgpu-pro-computing=16.30.3.315407-2') arch=('x86_64') rm -Rf "${srcdir}"/amdgpu-pro_16.30.3-315407_amd64 @@ -41,7 +61,7 @@ package_amdgpu-pro () { package_amdgpu-pro-clinfo () { pkgdesc="AMD OpenCL info utility" - depends=('amdgpu-pro-libopencl1=16.30.3.315407-1') + depends=('amdgpu-pro-libopencl1=16.30.3.315407-2') arch=('x86_64') rm -Rf "${srcdir}"/amdgpu-pro-clinfo_16.30.3-315407_amd64 @@ -60,7 +80,7 @@ package_amdgpu-pro-clinfo () { package_amdgpu-pro-computing () { pkgdesc="This package install amdgpu-pro OpenCL components." - depends=('amdgpu-pro-core=16.30.3.315407-1' 'amdgpu-pro-clinfo=16.30.3.315407-1' 'amdgpu-pro-opencl-icd=16.30.3.315407-1' 'amdgpu-pro-libopencl-dev=16.30.3.315407-1') + depends=('amdgpu-pro-core=16.30.3.315407-2' 'amdgpu-pro-clinfo=16.30.3.315407-2' 'amdgpu-pro-opencl-icd=16.30.3.315407-2' 'amdgpu-pro-libopencl-dev=16.30.3.315407-2') arch=('x86_64') rm -Rf "${srcdir}"/amdgpu-pro-computing_16.30.3-315407_amd64 @@ -79,7 +99,7 @@ package_amdgpu-pro-computing () { package_amdgpu-pro-core () { pkgdesc="This package switchs the GPU stack to amdgpu-pro with basic components." - depends=('linux-firmware' 'libdrm-amdgpu-pro-amdgpu1=16.30.3.315407-1') + depends=('linux-firmware' 'libdrm-amdgpu-pro-amdgpu1=16.30.3.315407-2') arch=('x86_64') rm -Rf "${srcdir}"/amdgpu-pro-core_16.30.3-315407_amd64 @@ -122,6 +142,19 @@ package_amdgpu-pro-dkms () { mv "${pkgdir}"/usr/lib/x86_64-linux-gnu/* "${pkgdir}"/usr/lib rmdir "${pkgdir}"/usr/lib/x86_64-linux-gnu fi + (cd ${pkgdir}/usr/src/amdgpu-pro-16.30.3-315407; + sed -i 's/\/extra/\/extramodules/' dkms.conf + patch -p1 -i "${srcdir}/0001-add-OS-detection-for-arch.patch"; + patch -p1 -i "${srcdir}/0002-update-kcl_ttm_bo_reserve-for-linux-4.7.patch"; + patch -p1 -i "${srcdir}/0003-add-kcl_drm_gem_object_lookup.patch"; + patch -p1 -i "${srcdir}/0004-paging-changes-for-linux-4.6.patch"; + patch -p1 -i "${srcdir}/0005-LRU-stuff-isn-t-available-until-4.7.x.patch"; + patch -p1 -i "${srcdir}/0006-Change-name-of-vblank_disable_allowed-to-vblank_disa.patch"; + patch -p1 -i "${srcdir}/0007-Remove-connector-parameter-from-__drm_atomic_helper_.patch"; + patch -p1 -i "${srcdir}/0008-fix-apparent-typo-in-bandwidth_calcs-causing-array-e.patch"; + patch -p1 -i "${srcdir}/0009-disable-dal-by-default.patch"; + patch -p1 -i "${srcdir}/0010-remove-dependency-on-System.map.patch") + } @@ -143,13 +176,16 @@ package_amdgpu-pro-firmware () { fi mv ${pkgdir}/lib ${pkgdir}/usr/ + mv ${pkgdir}/usr/lib/firmware ${pkgdir}/usr/lib/firmware.tmp + mkdir -p ${pkgdir}/usr/lib/firmware + mv ${pkgdir}/usr/lib/firmware.tmp ${pkgdir}/usr/lib/firmware/updates } package_amdgpu-pro-graphics () { pkgdesc="This package install amdgpu-pro graphics components." - depends=('amdgpu-pro-core=16.30.3.315407-1' 'libgles2-amdgpu-pro=16.30.3.315407-1' 'libgl1-amdgpu-pro-dev=16.30.3.315407-1' 'libgl1-amdgpu-pro-dri=16.30.3.315407-1' 'xserver-xorg-video-amdgpu-pro=16.30.3.315407-1' 'amdgpu-pro-vulkan-driver=16.30.3.315407-1' 'libvdpau-amdgpu-pro=16.30.3.315407-1') + depends=('amdgpu-pro-core=16.30.3.315407-2' 'libgles2-amdgpu-pro=16.30.3.315407-2' 'libgl1-amdgpu-pro-dev=16.30.3.315407-2' 'libgl1-amdgpu-pro-dri=16.30.3.315407-2' 'xserver-xorg-video-amdgpu-pro=16.30.3.315407-2' 'amdgpu-pro-vulkan-driver=16.30.3.315407-2' 'libvdpau-amdgpu-pro=16.30.3.315407-2') arch=('x86_64') rm -Rf "${srcdir}"/amdgpu-pro-graphics_16.30.3-315407_amd64 @@ -172,7 +208,7 @@ package_amdgpu-pro-graphics () { package_lib32-amdgpu-pro-lib32 () { pkgdesc="This package contains x86 libs for x86_64 machine usage." - depends=('lib32-libgles2-amdgpu-pro=16.30.3.315407-1' 'lib32-libgl1-amdgpu-pro-dev=16.30.3.315407-1' 'lib32-libgl1-amdgpu-pro-dri=16.30.3.315407-1' 'lib32-libgbm1-amdgpu-pro=16.30.3.315407-1' 'lib32-amdgpu-pro-opencl-icd=16.30.3.315407-1' 'lib32-amdgpu-pro-libopencl-dev=16.30.3.315407-1' 'lib32-amdgpu-pro-vulkan-driver=16.30.3.315407-1' 'lib32-libvdpau-amdgpu-pro=16.30.3.315407-1') + depends=('lib32-libgles2-amdgpu-pro=16.30.3.315407-2' 'lib32-libgl1-amdgpu-pro-dev=16.30.3.315407-2' 'lib32-libgl1-amdgpu-pro-dri=16.30.3.315407-2' 'lib32-libgbm1-amdgpu-pro=16.30.3.315407-2' 'lib32-amdgpu-pro-opencl-icd=16.30.3.315407-2' 'lib32-amdgpu-pro-libopencl-dev=16.30.3.315407-2' 'lib32-amdgpu-pro-vulkan-driver=16.30.3.315407-2' 'lib32-libvdpau-amdgpu-pro=16.30.3.315407-2') arch=('x86_64') rm -Rf "${srcdir}"/amdgpu-pro-lib32_16.30.3-315407_i386 @@ -196,7 +232,7 @@ package_lib32-amdgpu-pro-lib32 () { package_lib32-amdgpu-pro-libopencl-dev () { pkgdesc="AMD OpenCL ICD Loader library" - depends=('lib32-amdgpu-pro-libopencl1=16.30.3.315407-1') + depends=('lib32-amdgpu-pro-libopencl1=16.30.3.315407-2') arch=('x86_64') rm -Rf "${srcdir}"/amdgpu-pro-libopencl-dev_16.30.3-315407_i386 @@ -220,7 +256,7 @@ package_lib32-amdgpu-pro-libopencl-dev () { package_amdgpu-pro-libopencl-dev () { pkgdesc="AMD OpenCL ICD Loader library" - depends=('amdgpu-pro-libopencl1=16.30.3.315407-1') + depends=('amdgpu-pro-libopencl1=16.30.3.315407-2') arch=('x86_64') rm -Rf "${srcdir}"/amdgpu-pro-libopencl-dev_16.30.3-315407_amd64 @@ -321,7 +357,7 @@ package_lib32-amdgpu-pro-opencl-icd () { package_amdgpu-pro-vulkan-driver () { pkgdesc="AMDGPU Pro Vulkan driver" - depends=('libdrm-amdgpu-pro-amdgpu1=16.30.3.315407-1') + depends=('libdrm-amdgpu-pro-amdgpu1=16.30.3.315407-2') arch=('x86_64') rm -Rf "${srcdir}"/amdgpu-pro-vulkan-driver_16.30.3-315407_amd64 @@ -343,7 +379,7 @@ package_amdgpu-pro-vulkan-driver () { package_lib32-amdgpu-pro-vulkan-driver () { pkgdesc="AMDGPU Pro Vulkan driver" - depends=('lib32-libdrm-amdgpu-pro-amdgpu1=16.30.3.315407-1') + depends=('lib32-libdrm-amdgpu-pro-amdgpu1=16.30.3.315407-2') arch=('x86_64') rm -Rf "${srcdir}"/amdgpu-pro-vulkan-driver_16.30.3-315407_i386 @@ -366,7 +402,7 @@ package_lib32-amdgpu-pro-vulkan-driver () { package_libdrm-amdgpu-pro-amdgpu1 () { pkgdesc="Userspace interface to amdgpu-specific kernel DRM services -- runtime" - depends=('libdrm2-amdgpu-pro=16.30.3.315407-1') + depends=('libdrm2-amdgpu-pro=16.30.3.315407-2') arch=('x86_64') rm -Rf "${srcdir}"/libdrm-amdgpu-pro-amdgpu1_16.30.3-315407_amd64 @@ -385,7 +421,7 @@ package_libdrm-amdgpu-pro-amdgpu1 () { package_lib32-libdrm-amdgpu-pro-amdgpu1 () { pkgdesc="Userspace interface to amdgpu-specific kernel DRM services -- runtime" - depends=('lib32-libdrm2-amdgpu-pro=16.30.3.315407-1') + depends=('lib32-libdrm2-amdgpu-pro=16.30.3.315407-2') arch=('x86_64') rm -Rf "${srcdir}"/libdrm-amdgpu-pro-amdgpu1_16.30.3-315407_i386 @@ -405,7 +441,7 @@ package_lib32-libdrm-amdgpu-pro-amdgpu1 () { package_lib32-libdrm-amdgpu-pro-dev () { pkgdesc="Userspace interface to kernel DRM services -- development files" - depends=('lib32-libdrm2-amdgpu-pro=16.30.3.315407-1' 'lib32-libdrm-amdgpu-pro-amdgpu1=16.30.3.315407-1') + depends=('lib32-libdrm2-amdgpu-pro=16.30.3.315407-2' 'lib32-libdrm-amdgpu-pro-amdgpu1=16.30.3.315407-2') arch=('x86_64') rm -Rf "${srcdir}"/libdrm-amdgpu-pro-dev_16.30.3-315407_i386 @@ -425,7 +461,7 @@ package_lib32-libdrm-amdgpu-pro-dev () { package_libdrm-amdgpu-pro-dev () { pkgdesc="Userspace interface to kernel DRM services -- development files" - depends=('libdrm2-amdgpu-pro=16.30.3.315407-1' 'libdrm-amdgpu-pro-amdgpu1=16.30.3.315407-1') + depends=('libdrm2-amdgpu-pro=16.30.3.315407-2' 'libdrm-amdgpu-pro-amdgpu1=16.30.3.315407-2') arch=('x86_64') rm -Rf "${srcdir}"/libdrm-amdgpu-pro-dev_16.30.3-315407_amd64 @@ -444,7 +480,7 @@ package_libdrm-amdgpu-pro-dev () { package_libdrm-amdgpu-pro-tools () { pkgdesc="testing tools for libdrm-amdgpu-pro" - depends=('libdrm-amdgpu-pro-amdgpu1=16.30.3.315407-1' 'libdrm2-amdgpu-pro=16.30.3.315407-1') + depends=('libdrm-amdgpu-pro-amdgpu1=16.30.3.315407-2' 'libdrm2-amdgpu-pro=16.30.3.315407-2') arch=('x86_64') rm -Rf "${srcdir}"/libdrm-amdgpu-pro-tools_16.30.3-315407_amd64 @@ -549,7 +585,7 @@ package_lib32-libegl1-amdgpu-pro () { package_lib32-libegl1-amdgpu-pro-dev () { pkgdesc="implementation of the EGL API -- development files" - depends=('lib32-libegl1-amdgpu-pro=16.30.3.315407-1') + depends=('lib32-libegl1-amdgpu-pro=16.30.3.315407-2') arch=('x86_64') rm -Rf "${srcdir}"/libegl1-amdgpu-pro-dev_16.30.3-315407_i386 @@ -573,7 +609,7 @@ package_lib32-libegl1-amdgpu-pro-dev () { package_libegl1-amdgpu-pro-dev () { pkgdesc="implementation of the EGL API -- development files" - depends=('libegl1-amdgpu-pro=16.30.3.315407-1') + depends=('libegl1-amdgpu-pro=16.30.3.315407-2') arch=('x86_64') rm -Rf "${srcdir}"/libegl1-amdgpu-pro-dev_16.30.3-315407_amd64 @@ -596,7 +632,7 @@ package_libegl1-amdgpu-pro-dev () { package_libgbm-amdgpu-pro-dev () { pkgdesc="generic buffer management API -- development files" - depends=('libgbm1-amdgpu-pro=16.30.3.315407-1') + depends=('libgbm1-amdgpu-pro=16.30.3.315407-2') arch=('x86_64') rm -Rf "${srcdir}"/libgbm-amdgpu-pro-dev_16.30.3-315407_amd64 @@ -615,7 +651,7 @@ package_libgbm-amdgpu-pro-dev () { package_lib32-libgbm-amdgpu-pro-dev () { pkgdesc="generic buffer management API -- development files" - depends=('lib32-libgbm1-amdgpu-pro=16.30.3.315407-1') + depends=('lib32-libgbm1-amdgpu-pro=16.30.3.315407-2') arch=('x86_64') rm -Rf "${srcdir}"/libgbm-amdgpu-pro-dev_16.30.3-315407_i386 @@ -635,7 +671,7 @@ package_lib32-libgbm-amdgpu-pro-dev () { package_libgbm1-amdgpu-pro () { pkgdesc="generic buffer management API -- runtime" - depends=('libdrm-amdgpu-pro-amdgpu1=16.30.3.315407-1' 'libdrm2-amdgpu-pro=16.30.3.315407-1') + depends=('libdrm-amdgpu-pro-amdgpu1=16.30.3.315407-2' 'libdrm2-amdgpu-pro=16.30.3.315407-2') arch=('x86_64') rm -Rf "${srcdir}"/libgbm1-amdgpu-pro_16.30.3-315407_amd64 @@ -654,7 +690,7 @@ package_libgbm1-amdgpu-pro () { package_lib32-libgbm1-amdgpu-pro () { pkgdesc="generic buffer management API -- runtime" - depends=('lib32-libdrm-amdgpu-pro-amdgpu1=16.30.3.315407-1' 'lib32-libdrm2-amdgpu-pro=16.30.3.315407-1') + depends=('lib32-libdrm-amdgpu-pro-amdgpu1=16.30.3.315407-2' 'lib32-libdrm2-amdgpu-pro=16.30.3.315407-2') arch=('x86_64') rm -Rf "${srcdir}"/libgbm1-amdgpu-pro_16.30.3-315407_i386 @@ -674,7 +710,7 @@ package_lib32-libgbm1-amdgpu-pro () { package_lib32-libgl1-amdgpu-pro-dev () { pkgdesc="implementation of the OpenGL API -- GLX development files" - depends=('lib32-libgl1-amdgpu-pro-glx=16.30.3.315407-1') + depends=('lib32-libgl1-amdgpu-pro-glx=16.30.3.315407-2') arch=('x86_64') rm -Rf "${srcdir}"/libgl1-amdgpu-pro-dev_16.30.3-315407_i386 @@ -698,7 +734,7 @@ package_lib32-libgl1-amdgpu-pro-dev () { package_libgl1-amdgpu-pro-dev () { pkgdesc="implementation of the OpenGL API -- GLX development files" - depends=('libgl1-amdgpu-pro-glx=16.30.3.315407-1') + depends=('libgl1-amdgpu-pro-glx=16.30.3.315407-2') arch=('x86_64') rm -Rf "${srcdir}"/libgl1-amdgpu-pro-dev_16.30.3-315407_amd64 @@ -760,7 +796,7 @@ package_libgl1-amdgpu-pro-dri () { package_libgl1-amdgpu-pro-glx () { pkgdesc="implementation of the OpenGL API -- GLX runtime" - depends=('libdrm2-amdgpu-pro=16.30.3.315407-1' 'libx11>=1.4.99.1' 'libxcb>=1.8' 'libxcb' 'libxcb>=1.9.2' 'libxdamage>=1.1' 'libxext' 'libxfixes' 'libxshmfence' 'libxxf86vm') + depends=('libdrm2-amdgpu-pro=16.30.3.315407-2' 'libx11>=1.4.99.1' 'libxcb>=1.8' 'libxcb' 'libxcb>=1.9.2' 'libxdamage>=1.1' 'libxext' 'libxfixes' 'libxshmfence' 'libxxf86vm') arch=('x86_64') rm -Rf "${srcdir}"/libgl1-amdgpu-pro-glx_16.30.3-315407_amd64 @@ -783,7 +819,7 @@ package_libgl1-amdgpu-pro-glx () { package_lib32-libgl1-amdgpu-pro-glx () { pkgdesc="implementation of the OpenGL API -- GLX runtime" - depends=('lib32-libdrm2-amdgpu-pro=16.30.3.315407-1' 'lib32-libx11>=1.4.99.1' 'lib32-libxcb>=1.8' 'lib32-libxcb' 'lib32-libxcb>=1.9.2' 'lib32-libxdamage>=1.1' 'lib32-libxext' 'lib32-libxfixes' 'lib32-libxshmfence' 'lib32-libxxf86vm') + depends=('lib32-libdrm2-amdgpu-pro=16.30.3.315407-2' 'lib32-libx11>=1.4.99.1' 'lib32-libxcb>=1.8' 'lib32-libxcb' 'lib32-libxcb>=1.9.2' 'lib32-libxdamage>=1.1' 'lib32-libxext' 'lib32-libxfixes' 'lib32-libxshmfence' 'lib32-libxxf86vm') arch=('x86_64') rm -Rf "${srcdir}"/libgl1-amdgpu-pro-glx_16.30.3-315407_i386 @@ -807,7 +843,7 @@ package_lib32-libgl1-amdgpu-pro-glx () { package_libgles2-amdgpu-pro () { pkgdesc="implementation of the OpenGL|ES 2.x API -- runtime" - depends=('libegl1-amdgpu-pro=16.30.3.315407-1') + depends=('libegl1-amdgpu-pro=16.30.3.315407-2') arch=('x86_64') rm -Rf "${srcdir}"/libgles2-amdgpu-pro_16.30.3-315407_amd64 @@ -826,7 +862,7 @@ package_libgles2-amdgpu-pro () { package_lib32-libgles2-amdgpu-pro () { pkgdesc="implementation of the OpenGL|ES 2.x API -- runtime" - depends=('lib32-libegl1-amdgpu-pro=16.30.3.315407-1') + depends=('lib32-libegl1-amdgpu-pro=16.30.3.315407-2') arch=('x86_64') rm -Rf "${srcdir}"/libgles2-amdgpu-pro_16.30.3-315407_i386 @@ -846,7 +882,7 @@ package_lib32-libgles2-amdgpu-pro () { package_libgles2-amdgpu-pro-dev () { pkgdesc="implementation of the OpenGL|ES 2.x API -- development files" - depends=('libgles2-amdgpu-pro=16.30.3.315407-1') + depends=('libgles2-amdgpu-pro=16.30.3.315407-2') arch=('x86_64') rm -Rf "${srcdir}"/libgles2-amdgpu-pro-dev_16.30.3-315407_amd64 @@ -869,7 +905,7 @@ package_libgles2-amdgpu-pro-dev () { package_lib32-libgles2-amdgpu-pro-dev () { pkgdesc="implementation of the OpenGL|ES 2.x API -- development files" - depends=('lib32-libgles2-amdgpu-pro=16.30.3.315407-1') + depends=('lib32-libgles2-amdgpu-pro=16.30.3.315407-2') arch=('x86_64') rm -Rf "${srcdir}"/libgles2-amdgpu-pro-dev_16.30.3-315407_i386 @@ -893,7 +929,7 @@ package_lib32-libgles2-amdgpu-pro-dev () { package_lib32-libvdpau-amdgpu-pro () { pkgdesc="AMDGPU Pro VDPAU driver" - depends=('lib32-libdrm-amdgpu-pro-amdgpu1=16.30.3.315407-1' 'lib32-libdrm>=2.4.31' 'lib32-libdrm2-amdgpu-pro=16.30.3.315407-1' 'lib32-openssl>=1.0.0' 'lib32-libx11' 'lib32-libxcb>=1.8' 'lib32-libxcb' 'lib32-zlib>=1.2.0') + depends=('lib32-libdrm-amdgpu-pro-amdgpu1=16.30.3.315407-2' 'lib32-libdrm>=2.4.31' 'lib32-libdrm2-amdgpu-pro=16.30.3.315407-2' 'lib32-openssl>=1.0.0' 'lib32-libx11' 'lib32-libxcb>=1.8' 'lib32-libxcb' 'lib32-zlib>=1.2.0') arch=('x86_64') rm -Rf "${srcdir}"/libvdpau-amdgpu-pro_16.30.3-315407_i386 @@ -913,7 +949,7 @@ package_lib32-libvdpau-amdgpu-pro () { package_libvdpau-amdgpu-pro () { pkgdesc="AMDGPU Pro VDPAU driver" - depends=('libdrm-amdgpu-pro-amdgpu1=16.30.3.315407-1' 'libdrm>=2.4.31' 'libdrm2-amdgpu-pro=16.30.3.315407-1' 'openssl>=1.0.0' 'libx11' 'libxcb>=1.8' 'libxcb') + depends=('libdrm-amdgpu-pro-amdgpu1=16.30.3.315407-2' 'libdrm>=2.4.31' 'libdrm2-amdgpu-pro=16.30.3.315407-2' 'openssl>=1.0.0' 'libx11' 'libxcb>=1.8' 'libxcb') arch=('x86_64') rm -Rf "${srcdir}"/libvdpau-amdgpu-pro_16.30.3-315407_amd64 @@ -932,7 +968,7 @@ package_libvdpau-amdgpu-pro () { package_xserver-xorg-video-amdgpu-pro () { pkgdesc="X.Org X server -- AMD/ATI Amdgpu-Pro display driver" - depends=('libdrm-amdgpu-pro-amdgpu1=16.30.3.315407-1' 'libdrm2-amdgpu-pro=16.30.3.315407-1' 'libepoxy>=1.0' 'libgbm1-amdgpu-pro=16.30.3.315407-1' 'libgl1-amdgpu-pro-glx=16.30.3.315407-1' 'libsystemd>=183' 'libx11' 'libxcb' 'libxdamage>=1.1' 'libxext' 'libxfixes' 'libxxf86vm' 'xorg-server') + depends=('libdrm-amdgpu-pro-amdgpu1=16.30.3.315407-2' 'libdrm2-amdgpu-pro=16.30.3.315407-2' 'libepoxy>=1.0' 'libgbm1-amdgpu-pro=16.30.3.315407-2' 'libgl1-amdgpu-pro-glx=16.30.3.315407-2' 'libsystemd>=183' 'libx11' 'libxcb' 'libxdamage>=1.1' 'libxext' 'libxfixes' 'libxxf86vm' 'xorg-server') arch=('x86_64') rm -Rf "${srcdir}"/xserver-xorg-video-amdgpu-pro_16.30.3-315407_amd64 @@ -947,6 +983,7 @@ package_xserver-xorg-video-amdgpu-pro () { rmdir "${pkgdir}"/usr/lib/x86_64-linux-gnu fi + conflicts=('xf86-video-amdgpu') mkdir -p ${pkgdir}/usr/lib/x86_64-linux-gnu # This is needed because libglx.so has a hardcoded DRI_DRIVER_PATH ln -s /usr/lib/dri ${pkgdir}/usr/lib/x86_64-linux-gnu/dri |