Skip to content

Commit

Permalink
Nvidia: Update patch name and add for 6.10
Browse files Browse the repository at this point in the history
Signed-off-by: Peter Jung <[email protected]>
  • Loading branch information
ptr1337 committed Oct 25, 2024
1 parent d9d8856 commit 5e218ea
Show file tree
Hide file tree
Showing 12 changed files with 244 additions and 318 deletions.
16 changes: 10 additions & 6 deletions 6.10/misc/nvidia/0001-Make-modeset-and-fbdev-default-enabled.patch
Original file line number Diff line number Diff line change
@@ -1,15 +1,19 @@
From 448ba7ac50659c2ffe5244107e6469648009647a Mon Sep 17 00:00:00 2001
From da9767db1498ab8a679edccb297fa8a8e72ca628 Mon Sep 17 00:00:00 2001
From: Peter Jung <[email protected]>
Date: Thu, 26 Sep 2024 14:50:38 +0200
Subject: [PATCH 1/5] Make modeset and fbdev default enabled
Date: Fri, 18 Oct 2024 22:40:05 +0200
Subject: [PATCH 1/6] Make modeset and fbdev default enabled

This is generally required for Wayland on NVIDIA support.
NVIDIA is also planing to enable this as default in the future.

Signed-off-by: Peter Jung <[email protected]>
---
nvidia-drm/nvidia-drm-linux.c | 4 ++--
nvidia-drm/nvidia-drm-os-interface.c | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/nvidia-drm/nvidia-drm-linux.c b/nvidia-drm/nvidia-drm-linux.c
index 8c59b7cb..c7f4a239 100644
index 78429510..83d40983 100644
--- a/nvidia-drm/nvidia-drm-linux.c
+++ b/nvidia-drm/nvidia-drm-linux.c
@@ -31,13 +31,13 @@
Expand All @@ -20,7 +24,7 @@ index 8c59b7cb..c7f4a239 100644
+ "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_GENERIC_AVAILABLE)
#if defined(NV_DRM_FBDEV_AVAILABLE)
MODULE_PARM_DESC(
fbdev,
- "Create a framebuffer device (1 = enable, 0 = disable (default)) (EXPERIMENTAL)");
Expand All @@ -44,5 +48,5 @@ index 473004b5..75fb34b6 100644
void *nv_drm_calloc(size_t nmemb, size_t size)
{
--
2.46.2
2.47.0

Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
From ec0dc03cc4fb4cf5cab644e6e3a02d15da6771dc Mon Sep 17 00:00:00 2001
From 0638bf38e24b9fd304805686b4b8b4d8d127d21d Mon Sep 17 00:00:00 2001
From: Peter Jung <[email protected]>
Date: Thu, 26 Sep 2024 14:51:20 +0200
Subject: [PATCH 2/5] Do not error on unkown CPU Type and add Zen5 support
Date: Fri, 18 Oct 2024 22:40:38 +0200
Subject: [PATCH 2/6] Do not error on unkown CPU Type and add Zen5 support

Currently the Zen 5 CPU is an unknown CPU and prints an error in dmesg. Fix this with adding Zen5 support as well as change the print to a warning.

Signed-off-by: Peter Jung <[email protected]>
---
src/nvidia/src/kernel/platform/cpu.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
Expand Down Expand Up @@ -30,5 +33,5 @@ index bb76a9c2..6832e77c 100644
}
}
--
2.46.2
2.47.0

9 changes: 5 additions & 4 deletions 6.10/misc/nvidia/0003-Add-IBT-Support.patch
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
From ed4bcc72f91df7fe69c3ff0ac0aa45e268949f46 Mon Sep 17 00:00:00 2001
From ca61ee8197185b9db1d1f1d61460c60a0933eeb3 Mon Sep 17 00:00:00 2001
From: Peter Jung <[email protected]>
Date: Thu, 26 Sep 2024 14:51:45 +0200
Subject: [PATCH 3/5] Add IBT Support
Date: Fri, 18 Oct 2024 22:40:58 +0200
Subject: [PATCH 3/6] Add IBT support

Signed-off-by: Peter Jung <[email protected]>
---
src/nvidia-modeset/Makefile | 1 +
1 file changed, 1 insertion(+)
Expand All @@ -20,5 +21,5 @@ index 2b96f3fa..ed934014 100644

CFLAGS += $(CONDITIONAL_CFLAGS)
--
2.46.2
2.47.0

199 changes: 0 additions & 199 deletions 6.10/misc/nvidia/0004-6.11-Add-fix-for-fbdev.patch

This file was deleted.

Loading

0 comments on commit 5e218ea

Please sign in to comment.