5f8a9db80b1b6a61df115343d1fbc95e3c72c7c5 — Kridsada Thanabulpong a month ago 228feae
Remove DRIVER_HAVE_IRQ for DRM >= 5.1

For consistency with drm-next code
5 files changed, 25 insertions(+), 7 deletions(-)

M .SRCINFO
M .gitignore
M PKGBUILD
A mkpatch.sh
M patch_amd_amdgpu_amdgpu_drv_c.patch
M .SRCINFO => .SRCINFO +2 -2
@@ 1,7 1,7 @@ pkgbase = amdgpu-dkms
  	pkgdesc = DKMS AMDGPU driver from AMD
  	pkgver = 19.30_838629
- 	pkgrel = 2
+ 	pkgrel = 3
  	url = https://www.amd.com/en/support/kb/release-notes/rn-amdgpu-unified-navi-linux
  	arch = x86_64
  	license = custom


@@ 31,7 31,7 @@ sha256sums = d575728fbe9e53586a30c24865a4741b19ffb29e9845a2dd935cac3faea4bec9
  	sha256sums = be0940ccf42c941a5537acfeff299b2b0588e7e5e8f01a53e76a01b30efca2fd
  	sha256sums = aa09dc25dfdfbbcb1ccd16f5420f9f8291c5db97e7d366828244460015262f4a
- 	sha256sums = f169f7731877be9de1f2222b1d70658a057a6fc653b4b7bb820f9d88a0ba29e4
+ 	sha256sums = f3501aaae0680aeb4fd43c3d731c53544d53aa28a1b8bc728a33591c96f5417b
  	sha256sums = 62a6958c51817f53aeaf6d839132ebf4c81964658f6930146ac802d002d0ff74
  	sha256sums = ad824a6e0d30ed93fbe68b532029d70aca7bdacb3c227c35b835a4471c0d18f7
  	sha256sums = 7c8efd69177fc84cb340feb1940b224b684ba6459327e0f09ff720e1f16039e6

M .gitignore => .gitignore +1 -0
@@ 1,3 1,4 @@ *.tar.xz
+ *.log
  src/
  pkg/

M PKGBUILD => PKGBUILD +2 -2
@@ 4,7 4,7 @@ pkgname='amdgpu-dkms'
  pkgver=${major}_${minor}
  pkgdesc="DKMS AMDGPU driver from AMD"
- pkgrel=2
+ pkgrel=3
  arch=('x86_64')
  url=https://www.amd.com/en/support/kb/release-notes/rn-amdgpu-unified-navi-linux
  license=('custom')


@@ 38,7 38,7 @@ 'd575728fbe9e53586a30c24865a4741b19ffb29e9845a2dd935cac3faea4bec9'
              'be0940ccf42c941a5537acfeff299b2b0588e7e5e8f01a53e76a01b30efca2fd'
              'aa09dc25dfdfbbcb1ccd16f5420f9f8291c5db97e7d366828244460015262f4a'
-             'f169f7731877be9de1f2222b1d70658a057a6fc653b4b7bb820f9d88a0ba29e4'
+             'f3501aaae0680aeb4fd43c3d731c53544d53aa28a1b8bc728a33591c96f5417b'
              '62a6958c51817f53aeaf6d839132ebf4c81964658f6930146ac802d002d0ff74'
              'ad824a6e0d30ed93fbe68b532029d70aca7bdacb3c227c35b835a4471c0d18f7'
              '7c8efd69177fc84cb340feb1940b224b684ba6459327e0f09ff720e1f16039e6'

A mkpatch.sh => mkpatch.sh +17 -0
@@ 0,0 1,17 @@
+ #!/bin/sh
+ 
+ if [ $# != "1" ]; then
+     echo "$0 SOURCE_PATH"
+     exit 1
+ fi
+ 
+ HERE=$(cd "$(dirname "$0")"; pwd -P || exit 1)
+ SOURCE_PATH=$1; shift
+ cd "$SOURCE_PATH" || exit 1
+ 
+ for n in $(find . -iname "*.orig"); do
+     FILENAME="${n%%.orig}"
+     PATCHNAME=patch"$(printf "%s" "$FILENAME" | tr -sc "[0-9a-zA-Z]" "_")".patch
+     echo "Generating $PATCHNAME..."
+     diff -u "$n" "$FILENAME" > "$HERE/$PATCHNAME"
+ done

M patch_amd_amdgpu_amdgpu_drv_c.patch => patch_amd_amdgpu_amdgpu_drv_c.patch +3 -3
@@ 1,5 1,5 @@---- ./amd/amdgpu/amdgpu_drv.c.orig	2019-07-06 00:42:03.000000000 +0000
- +++ ./amd/amdgpu/amdgpu_drv.c	2019-07-23 17:48:36.539101827 +0000
+ --- ./amd/amdgpu/amdgpu_drv.c.orig	2019-07-28 04:36:48.218880843 +0700
+ +++ ./amd/amdgpu/amdgpu_drv.c	2019-07-28 03:58:22.781458252 +0700
  @@ -33,6 +33,9 @@
   #include <linux/pm_runtime.h>
   #include <linux/vga_switcheroo.h>


@@ 15,8 15,8 @@ DRIVER_ATOMIC |
   #endif
  -		DRIVER_HAVE_IRQ | DRIVER_IRQ_SHARED | DRIVER_GEM |
- +		DRIVER_HAVE_IRQ |
  +#if DRM_VERSION_CODE < DRM_VERSION(5, 1, 0)
+ +		DRIVER_HAVE_IRQ |
  +		DRIVER_IRQ_SHARED |
  +#endif
  +		DRIVER_GEM |