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

[Laurent Carlier]

    Date: Sunday, September 24, 2017 @ 10:37:16
  Author: lcarlier
Revision: 306186

upgpkg: nvidia-304xx-lts 304.137-1

upstream update 304.137

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

-------------------------+
 PKGBUILD                |   15 ++++++---------
 drm-driver-legacy.patch |   20 --------------------
 2 files changed, 6 insertions(+), 29 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-09-24 10:34:54 UTC (rev 306185)
+++ PKGBUILD	2017-09-24 10:37:16 UTC (rev 306186)
@@ -3,9 +3,9 @@
 # Contributor: Andreas Radke <andyrtr at archlinux.org>
 
 pkgname=nvidia-304xx-lts
-pkgver=304.135
+pkgver=304.137
 _extramodules=extramodules-4.9-lts
-pkgrel=12
+pkgrel=1
 pkgdesc="NVIDIA drivers for linux-lts, 304xx legacy branch"
 arch=('i686' 'x86_64')
 url="http://www.nvidia.com/"
@@ -23,12 +23,10 @@
 
 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
-        drm-driver-legacy.patch)
-sha512sums=('c2645cc9a6f23641d8b6da51e72e203980068c05e365fcc73b32322a6875ce95e81f4e0d893276e14e84e93464488539c16db6b3be04f5324cf7d7a12bb557f8'
-            'a5aa48baa75eb267bd193e59328aa5fbc15d41045bb7e97aa1b96b918b9e68a1c1bf95624d9d494336256e0af2c41e188d30fe91be4967084de3387f50d3805c'
-            '54e8825e523f11706890e09e476498f3a30f75ce4e350ff2ff8a1e1c3af574d9ccfb8903543766b6863d94cdfbf46e68cd3d33380867dd976cafc8dd2dd78774'
-            'fa39dee5c9f1ea98286c87165f683ee194b2cb4056aa6b556e822b9ee760dcf3683ea001c3704e79b9ac9712314d7df5690dc7f68440cda7a96791f94425455d')
+        disable-mtrr.patch)
+sha512sums=('021c5a88d50489aa0a1c7eac14259e23542b93578ae339995a2e38b786d06d239968c07933cab3fb78a922cffc7e213d6fa3fe07e34065a9c7f03e24f8729370'
+            '4ab648647e4f3e2c352b2eab6454c264fe4728d8eb1264fafee2a4ab1a4ce59516abcf8490044d31e35309ea951e564cc217e13f7139a48bbf650a4238c5b87c'
+            '54e8825e523f11706890e09e476498f3a30f75ce4e350ff2ff8a1e1c3af574d9ccfb8903543766b6863d94cdfbf46e68cd3d33380867dd976cafc8dd2dd78774')
 
 
 if [ "$CARCH" = "i686" ]; then
@@ -47,7 +45,6 @@
 
     # 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() {

Deleted: drm-driver-legacy.patch
===================================================================
--- drm-driver-legacy.patch	2017-09-24 10:34:54 UTC (rev 306185)
+++ drm-driver-legacy.patch	2017-09-24 10:37:16 UTC (rev 306186)
@@ -1,20 +0,0 @@
-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,