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

Laurent Carlier lcarlier at archlinux.org
Mon Jan 30 10:00:33 UTC 2017


    Date: Monday, January 30, 2017 @ 10:00:32
  Author: lcarlier
Revision: 287765

upgpkg: nvidia-304xx 304.134-5

fix FS#52734

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

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-01-30 09:26:20 UTC (rev 287764)
+++ PKGBUILD	2017-01-30 10:00:32 UTC (rev 287765)
@@ -6,7 +6,7 @@
 pkgname=(nvidia-304xx nvidia-304xx-dkms)
 pkgver=304.134
 _extramodules=extramodules-4.9-ARCH
-pkgrel=4
+pkgrel=5
 arch=('i686' 'x86_64')
 url="http://www.nvidia.com/"
 makedepends=('nvidia-304xx-libgl' "nvidia-304xx-utils=${pkgver}" 'linux' 'linux-headers>=4.9' 'linux-headers<4.10')
@@ -13,10 +13,12 @@
 conflicts=('nvidia')
 license=('custom')
 options=('!strip')
-source=('disable-mtrr.patch')
+source=('disable-mtrr.patch'
+        'drm-driver-legacy.patch')
 source_i686+=("http://us.download.nvidia.com/XFree86/Linux-x86/${pkgver}/NVIDIA-Linux-x86-${pkgver}.run")
 source_x86_64+=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run")
-sha512sums=('54e8825e523f11706890e09e476498f3a30f75ce4e350ff2ff8a1e1c3af574d9ccfb8903543766b6863d94cdfbf46e68cd3d33380867dd976cafc8dd2dd78774')
+sha512sums=('54e8825e523f11706890e09e476498f3a30f75ce4e350ff2ff8a1e1c3af574d9ccfb8903543766b6863d94cdfbf46e68cd3d33380867dd976cafc8dd2dd78774'
+            'fa39dee5c9f1ea98286c87165f683ee194b2cb4056aa6b556e822b9ee760dcf3683ea001c3704e79b9ac9712314d7df5690dc7f68440cda7a96791f94425455d')
 sha512sums_i686=('e047c62b33b092225ead42134acd596e3ae43d9bb8324188308dd7d497f33e790e7366d7a1c5ef5de66f484219d99de4c6e6206d390122d3fab4d30397ab463c')
 sha512sums_x86_64=('339efb8b47faaa16b984d84e43ef18d849a563c95298972c36616a22712740e3233c2cd7b0837d393a8f24a6ec5b501295cdc77adae12deccc993dfca48022fc')
 
@@ -31,6 +33,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)
 
     cp -a kernel kernel-dkms
 }

Added: drm-driver-legacy.patch
===================================================================
--- drm-driver-legacy.patch	                        (rev 0)
+++ drm-driver-legacy.patch	2017-01-30 10:00:32 UTC (rev 287765)
@@ -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,



More information about the arch-commits mailing list