forked from rpms/nvidia-open-kmod
Drop kernel-mode-setting patch, included upstream
This commit is contained in:
parent
0b513e14a1
commit
cbdc523c31
@ -1,45 +0,0 @@
|
||||
From a2e9b73f8d3f593eed007ebfe51dabc9a0e410c2 Mon Sep 17 00:00:00 2001
|
||||
From: Neal Gompa <ngompa@almalinux.org>
|
||||
Date: Mon, 7 Apr 2025 19:36:18 -0400
|
||||
Subject: [PATCH] kernel-open/nvidia-drm: Enable kernel mode-setting by default
|
||||
|
||||
The general expectation for the Linux graphics stack for more than
|
||||
a decade has been to use kernel mode-setting. It is now a requirement
|
||||
for things to work properly on Wayland-based graphical environments,
|
||||
so flip the default to use kernel mode-setting by default.
|
||||
|
||||
Signed-off-by: Neal Gompa <ngompa@almalinux.org>
|
||||
---
|
||||
kernel-open/nvidia-drm/nvidia-drm-linux.c | 2 +-
|
||||
kernel-open/nvidia-drm/nvidia-drm-os-interface.c | 2 +-
|
||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/kernel-open/nvidia-drm/nvidia-drm-linux.c b/kernel-open/nvidia-drm/nvidia-drm-linux.c
|
||||
index 3cb1815d..209cb469 100644
|
||||
--- a/kernel-open/nvidia-drm/nvidia-drm-linux.c
|
||||
+++ b/kernel-open/nvidia-drm/nvidia-drm-linux.c
|
||||
@@ -31,7 +31,7 @@
|
||||
|
||||
MODULE_PARM_DESC(
|
||||
modeset,
|
||||
- "Enable atomic kernel modesetting (1 = enable, 0 = disable (default))");
|
||||
+ "Enable atomic kernel modesetting (1 = enable (default), 0 = disable)");
|
||||
module_param_named(modeset, nv_drm_modeset_module_param, bool, 0400);
|
||||
|
||||
#if defined(NV_DRM_FBDEV_AVAILABLE)
|
||||
diff --git a/kernel-open/nvidia-drm/nvidia-drm-os-interface.c b/kernel-open/nvidia-drm/nvidia-drm-os-interface.c
|
||||
index 7617476d..f22afd77 100644
|
||||
--- a/kernel-open/nvidia-drm/nvidia-drm-os-interface.c
|
||||
+++ b/kernel-open/nvidia-drm/nvidia-drm-os-interface.c
|
||||
@@ -41,7 +41,7 @@
|
||||
#include <drm/drmP.h>
|
||||
#endif
|
||||
|
||||
-bool nv_drm_modeset_module_param = false;
|
||||
+bool nv_drm_modeset_module_param = true;
|
||||
bool nv_drm_fbdev_module_param = true;
|
||||
|
||||
void *nv_drm_calloc(size_t nmemb, size_t size)
|
||||
--
|
||||
2.48.1
|
||||
|
||||
@ -29,8 +29,6 @@ License: GPL-2.0-only and MIT
|
||||
URL: https://github.com/NVIDIA/open-gpu-kernel-modules
|
||||
Source0: %{url}/archive/%{version}/open-gpu-kernel-modules-%{version}.tar.gz
|
||||
|
||||
Patch0: 0001-kernel-open-nvidia-drm-Enable-kernel-mode-setting-by.patch
|
||||
|
||||
# For kmodtool
|
||||
Source10: kmod-%{kmodname}.spec.preamble
|
||||
|
||||
@ -38,9 +36,6 @@ Source10: kmod-%{kmodname}.spec.preamble
|
||||
Source20: kmp-local-override.macros
|
||||
Source21: kmodtool-local-override
|
||||
|
||||
# patch dependencies
|
||||
BuildRequires: git-core
|
||||
|
||||
# kernel module package macros were split out sometime after EL7...
|
||||
BuildRequires: kernel-rpm-macros
|
||||
# kmod dependencies
|
||||
@ -78,7 +73,7 @@ and newer models of GPU hardware.
|
||||
%{error:modsign_os macro not set to almalinux-nvidia-signing, exiting}
|
||||
%endif
|
||||
|
||||
%autosetup -n open-gpu-kernel-modules-%{version} -S git_am
|
||||
%autosetup -n open-gpu-kernel-modules-%{version}
|
||||
|
||||
for flavor in %{flavors_to_build}; do
|
||||
cp -a ../open-gpu-kernel-modules-%{version} ../%{name}-%{version}-kmodbuild-$flavor
|
||||
|
||||
Loading…
Reference in New Issue
Block a user