nvidia-390xx-utils: Enable modeset by default

Needed as for 470xx to support 6.12 kernel: https://aur.archlinux.org/packages/nvidia-390xx-dkms#comment-999906 Signed-off-by: Vasiliy Stelmachenok <[email protected]>
CachyOS · Jan 2, 2025 · 00e1b75 · 00e1b75
1 parent 1f01083
commit 00e1b75
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 4 deletions.
diff --git a/nvidia/nvidia-390xx-utils/.SRCINFO b/nvidia/nvidia-390xx-utils/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = nvidia-390xx-utils
 	pkgver = 390.157
-	pkgrel = 16
+	pkgrel = 17
 	url = https://www.nvidia.com/
 	arch = x86_64
 	license = custom
@@ -22,6 +22,7 @@ pkgbase = nvidia-390xx-utils
 	source = kernel-6.12.patch
 	source = kernel-4.16+-memory-encryption.patch
 	source = clang.patch
+	source = nvidia-390xx-Enable-modeset-by-default.patch
 	b2sums = bdd68a8bf9550a107528c8a494d58fbc54014ddeef3c440c97e7d89793f6dade0cd0ec8f05f8ee8ccfe41a4163eec07845885a960c6b93635143f2bd7f831d62
 	b2sums = c1da4ce5784e43385465913a95053a3e54f800aac6f1b49f33e2a77504d76da5e6db6ec7074fbe7ba5f52dcef9e1ebaa620942c33ff825a56caba5c9c8b0d1be
 	b2sums = 3878bb7828089dc84d62484af5a7265e0412c9524b733ec695a3879fd88d2768437239f62b5e45e7ffb702b2764dc06e97efcd534c9b5ee48894a13166bfe513
@@ -39,6 +40,7 @@ pkgbase = nvidia-390xx-utils
 	b2sums = aaa0597ab9d33be3c6e020fab0d54890d32f32c5ce70571e2bc989a788dbe2317e826475966bc1026bf7f7ff6672bd9a2f7f8e48dcebd2f91d33d9181eee1208
 	b2sums = a8234f542c2324ad698443e3decf7b6eacf3cb420b7aded787f102a8d32b64c2a8d45ea58e37a5e3b6f2f060f0cccd63d3a182065f57c606006d0ff8c7f6bb05
 	b2sums = c12c250ab339209dd6abeed85c0f0ce34bbc9ceccaf47765b7e434398601f5c1bdc96da5dc2eb29cbcb187b32ff01ea039db263a1c096d792598c170c5abf7fa
+	b2sums = 0f42d10d385c453873473e146c906fd57995a90ea0f460c2011646a7ba22c20101335b020aa4bb749b3a3d0714be9cd346f1c8b4b8094c75796a80b4ccf5ca72
 
 pkgname = nvidia-390xx-utils
 	pkgdesc = NVIDIA drivers utilities

diff --git a/nvidia/nvidia-390xx-utils/PKGBUILD b/nvidia/nvidia-390xx-utils/PKGBUILD
@@ -9,7 +9,7 @@
 pkgbase=nvidia-390xx-utils
 pkgname=('nvidia-390xx-utils' 'opencl-nvidia-390xx' 'nvidia-390xx-dkms')
 pkgver=390.157
-pkgrel=16
+pkgrel=17
 arch=('x86_64')
 url="https://www.nvidia.com/"
 license=('custom')
@@ -31,7 +31,8 @@ source=('nvidia-drm-outputclass.conf'
         kernel-6.10.patch
         kernel-6.12.patch
         kernel-4.16+-memory-encryption.patch
-        clang.patch)
+        clang.patch
+        nvidia-390xx-Enable-modeset-by-default.patch)
 b2sums=('bdd68a8bf9550a107528c8a494d58fbc54014ddeef3c440c97e7d89793f6dade0cd0ec8f05f8ee8ccfe41a4163eec07845885a960c6b93635143f2bd7f831d62'
         'c1da4ce5784e43385465913a95053a3e54f800aac6f1b49f33e2a77504d76da5e6db6ec7074fbe7ba5f52dcef9e1ebaa620942c33ff825a56caba5c9c8b0d1be'
         '3878bb7828089dc84d62484af5a7265e0412c9524b733ec695a3879fd88d2768437239f62b5e45e7ffb702b2764dc06e97efcd534c9b5ee48894a13166bfe513'
@@ -48,7 +49,8 @@ b2sums=('bdd68a8bf9550a107528c8a494d58fbc54014ddeef3c440c97e7d89793f6dade0cd0ec8
         'a06b47d59e11ab2f8bd7af97042a3ed15ac97559b3c507a03fa453481b86727d98f8a34e95c6fc38fe82f803d0b67282dba4f27d4f714d2c68eb2eb0ce98e575'
         'aaa0597ab9d33be3c6e020fab0d54890d32f32c5ce70571e2bc989a788dbe2317e826475966bc1026bf7f7ff6672bd9a2f7f8e48dcebd2f91d33d9181eee1208'
         'a8234f542c2324ad698443e3decf7b6eacf3cb420b7aded787f102a8d32b64c2a8d45ea58e37a5e3b6f2f060f0cccd63d3a182065f57c606006d0ff8c7f6bb05'
-        'c12c250ab339209dd6abeed85c0f0ce34bbc9ceccaf47765b7e434398601f5c1bdc96da5dc2eb29cbcb187b32ff01ea039db263a1c096d792598c170c5abf7fa')
+        'c12c250ab339209dd6abeed85c0f0ce34bbc9ceccaf47765b7e434398601f5c1bdc96da5dc2eb29cbcb187b32ff01ea039db263a1c096d792598c170c5abf7fa'
+        '0f42d10d385c453873473e146c906fd57995a90ea0f460c2011646a7ba22c20101335b020aa4bb749b3a3d0714be9cd346f1c8b4b8094c75796a80b4ccf5ca72')
 
 create_links() {
     # create soname links
@@ -100,6 +102,7 @@ prepare() {
 
     # From Joan Bruguera (https://gist.github.com/joanbm/a6d3f7f873a60dec0aa4a734c0f1d64e), edited by drankinatty
     patch -Np1 -i ../kernel-6.12.patch
+    patch -Np1 -i ../nvidia-390xx-Enable-modeset-by-default.patch
 
     cd kernel
 

diff --git a/nvidia/nvidia-390xx-utils/nvidia-390xx-Enable-modeset-by-default.patch b/nvidia/nvidia-390xx-utils/nvidia-390xx-Enable-modeset-by-default.patch
@@ -0,0 +1,30 @@
+From 57a8b850a8e0b4c3b4cf925d0d5f7fe6f5e4ca7d Mon Sep 17 00:00:00 2001
+From: Vasiliy Stelmachenok <[email protected]>
+Date: Thu, 2 Jan 2025 15:44:33 +0300
+Subject: [PATCH] nvidia-390xx: Enable modeset by default
+
+This is required by the patch to support 6.12.
+
+Signed-off-by: Vasiliy Stelmachenok <[email protected]>
+---
+ kernel/nvidia-drm/nvidia-drm-linux.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/kernel/nvidia-drm/nvidia-drm-linux.c b/kernel/nvidia-drm/nvidia-drm-linux.c
+index a4c5aeb..2523350 100644
+--- a/kernel/nvidia-drm/nvidia-drm-linux.c
++++ b/kernel/nvidia-drm/nvidia-drm-linux.c
+@@ -41,8 +41,8 @@
+
+ MODULE_PARM_DESC(
+     modeset,
+-    "Enable atomic kernel modesetting (1 = enable, 0 = disable (default))");
+-bool nv_drm_modeset_module_param = false;
++    "Enable atomic kernel modesetting (1 = enable (default), 0 = disable)");
++bool nv_drm_modeset_module_param = true;
+ module_param_named(modeset, nv_drm_modeset_module_param, bool, 0400);
+
+ void *nv_drm_calloc(size_t nmemb, size_t size)
+-- 
+2.47.1
+