[arch-commits] Commit in nvidia-304xx-lts/trunk (PKGBUILD drm-driver-legacy.patch)

[Andreas Radke]

    Date: Sunday, April 9, 2017 @ 07:52:58
  Author: andyrtr
Revision: 292551

upgpkg: nvidia-304xx-lts 304.135-5

apply legacy drm / kernel 4.9 patch ;FS#53511

Added:
  nvidia-304xx-lts/trunk/drm-driver-legacy.patch
Modified:
  nvidia-304xx-lts/trunk/PKGBUILD

-------------------------+
 PKGBUILD                |    9 ++++++---
 drm-driver-legacy.patch |   20 ++++++++++++++++++++
 2 files changed, 26 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-04-09 07:37:21 UTC (rev 292550)
+++ PKGBUILD	2017-04-09 07:52:58 UTC (rev 292551)
@@ -5,7 +5,7 @@
 pkgname=nvidia-304xx-lts
 pkgver=304.135
 _extramodules=extramodules-4.9-lts
-pkgrel=4
+pkgrel=5
 pkgdesc="NVIDIA drivers for linux-lts, 304xx legacy branch"
 arch=('i686' 'x86_64')
 url="http://www.nvidia.com/"
@@ -23,10 +23,12 @@
 
 source=("http://us.download.nvidia.com/XFree86/Linux-x86/${pkgver}/NVIDIA-Linux-x86-${pkgver}.run"
         "http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run"
-        disable-mtrr.patch)
+        disable-mtrr.patch
+        drm-driver-legacy.patch)
 sha512sums=('c2645cc9a6f23641d8b6da51e72e203980068c05e365fcc73b32322a6875ce95e81f4e0d893276e14e84e93464488539c16db6b3be04f5324cf7d7a12bb557f8'
             'a5aa48baa75eb267bd193e59328aa5fbc15d41045bb7e97aa1b96b918b9e68a1c1bf95624d9d494336256e0af2c41e188d30fe91be4967084de3387f50d3805c'
-            '54e8825e523f11706890e09e476498f3a30f75ce4e350ff2ff8a1e1c3af574d9ccfb8903543766b6863d94cdfbf46e68cd3d33380867dd976cafc8dd2dd78774')
+            '54e8825e523f11706890e09e476498f3a30f75ce4e350ff2ff8a1e1c3af574d9ccfb8903543766b6863d94cdfbf46e68cd3d33380867dd976cafc8dd2dd78774'
+            'fa39dee5c9f1ea98286c87165f683ee194b2cb4056aa6b556e822b9ee760dcf3683ea001c3704e79b9ac9712314d7df5690dc7f68440cda7a96791f94425455d')
 
 
 if [ "$CARCH" = "i686" ]; then
@@ -45,6 +47,7 @@
 
     # FS#47092
     #(cd kernel; patch -p1 --no-backup-if-mismatch -i "$srcdir"/disable-mtrr.patch)
+    (cd kernel; patch -p1 --no-backup-if-mismatch -i "$srcdir"/drm-driver-legacy.patch)
 }
 
 build() {

Added: drm-driver-legacy.patch
===================================================================
--- drm-driver-legacy.patch	                        (rev 0)
+++ drm-driver-legacy.patch	2017-04-09 07:52:58 UTC (rev 292551)
@@ -0,0 +1,20 @@
+Author: Luca Boccassi <luca.boccassi at gmail.com>
+Description: Fix kernel module load on 4.9 and greater
+ From kernel 4.9 and newer (commit fa5386459f06) non-modesetting drivers have
+ to use the DRM flag DRIVER_LEGACY. Without this flag the kernel module does
+ not load correctly.
+
+--- a/nv-drm.c
++++ b/nv-drm.c
+@@ -71,7 +71,11 @@
+ };
+ 
+ static struct drm_driver nv_drm_driver = {
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 9, 0)
+     .driver_features = 0,
++#else
++    .driver_features = DRIVER_LEGACY,
++#endif
+     .load = nv_drm_load,
+     .unload = nv_drm_unload,
+     .fops = &nv_drm_fops,