This commit is contained in:
parent
7818ee793e
commit
3b9439698b
2
.github/build-nest-v3
vendored
2
.github/build-nest-v3
vendored
@ -1 +1 @@
|
||||
3
|
||||
1
|
@ -7,13 +7,13 @@ Currently the Zen 5 CPU is an unknown CPU and prints an error in dmesg. Fix this
|
||||
|
||||
Signed-off-by: Peter Jung <admin@ptr1337.dev>
|
||||
---
|
||||
src/nvidia/src/kernel/platform/cpu.c | 8 +++++---
|
||||
kernel/platform/cpu.c | 8 +++++---
|
||||
1 file changed, 5 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/src/nvidia/src/kernel/platform/cpu.c b/src/nvidia/src/kernel/platform/cpu.c
|
||||
diff --git a/kernel/platform/cpu.c b/kernel/platform/cpu.c
|
||||
index bb76a9c2..6832e77c 100644
|
||||
--- a/src/nvidia/src/kernel/platform/cpu.c
|
||||
+++ b/src/nvidia/src/kernel/platform/cpu.c
|
||||
--- a/kernel/platform/cpu.c
|
||||
+++ b/kernel/platform/cpu.c
|
||||
@@ -1401,12 +1401,14 @@ static void cpuidInfoAMD(OBJSYS *pSys, PCPUIDINFO pCpuidInfo)
|
||||
// Zen, Zen+, Zen 2
|
||||
case 0x0A0:
|
||||
|
@ -8,13 +8,13 @@ Silence it for now.
|
||||
|
||||
Signed-off-by: Peter Jung <admin@ptr1337.dev>
|
||||
---
|
||||
src/nvidia/src/kernel/rmapi/event_notification.c | 4 ++--
|
||||
kernel/rmapi/event_notification.c | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/nvidia/src/kernel/rmapi/event_notification.c b/src/nvidia/src/kernel/rmapi/event_notification.c
|
||||
diff --git a/kernel/rmapi/event_notification.c b/kernel/rmapi/event_notification.c
|
||||
index cf78eadd..d6937cac 100644
|
||||
--- a/src/nvidia/src/kernel/rmapi/event_notification.c
|
||||
+++ b/src/nvidia/src/kernel/rmapi/event_notification.c
|
||||
--- a/kernel/rmapi/event_notification.c
|
||||
+++ b/kernel/rmapi/event_notification.c
|
||||
@@ -286,11 +286,11 @@ static NV_STATUS _gpuEngineEventNotificationListNotify
|
||||
portSyncSpinlockAcquire(pEventNotificationList->pSpinlock);
|
||||
{
|
||||
|
@ -22,48 +22,48 @@ ifeq (amd64,$(DEB_HOST_ARCH))
|
||||
# This avoids various issue, when Simplefb is used
|
||||
# https://gitlab.archlinux.org/archlinux/packaging/packages/nvidia-utils/-/issues/14
|
||||
# https://github.com/rpmfusion/nvidia-kmod/blob/master/make_modeset_default.patch
|
||||
patch -Np1 -i $(CURDIR)/debian/patches/0001-Make-modeset-and-fbdev-default-enabled.patch -d $(CURDIR)/debian/tmp/kernel
|
||||
patch -Np1 -i $(CURDIR)/debian/patches/0001-Make-modeset-and-fbdev-default-enabled.patch -d $(CURDIR)/debian/tmp/kernel-open
|
||||
patch -Np1 -i $(CURDIR)/debian/patches/0001-Make-modeset-and-fbdev-default-enabled.patch -d debian/tmp/kernel/nvidia-drm
|
||||
patch -Np1 -i $(CURDIR)/debian/patches/0001-Make-modeset-and-fbdev-default-enabled.patch -d debian/tmp/kernel-open/nvidia-drm
|
||||
|
||||
# Dont error, when Zen5 CPU is in the system
|
||||
patch -Np1 -i $(CURDIR)/debian/patches/0002-Do-not-error-on-unkown-CPU-Type-and-add-Zen5-support.patch -d $(CURDIR)/debian/tmp/kernel
|
||||
patch -Np1 -i $(CURDIR)/debian/patches/0002-Do-not-error-on-unkown-CPU-Type-and-add-Zen5-support.patch -d $(CURDIR)/debian/tmp/kernel-open
|
||||
patch -Np2 -i $(CURDIR)/debian/patches/0002-Do-not-error-on-unkown-CPU-Type-and-add-Zen5-support.patch -d debian/tmp/kernel/nvidia
|
||||
patch -Np2 -i $(CURDIR)/debian/patches/0002-Do-not-error-on-unkown-CPU-Type-and-add-Zen5-support.patch -d debian/tmp/kernel-open/nvidia
|
||||
|
||||
# Fix for https://bugs.archlinux.org/task/74886
|
||||
patch -Np2 -i $(CURDIR)/debian/patches/0003-Add-IBT-support.patch -d $(CURDIR)/debian/tmp/kernel
|
||||
patch -Np2 -i $(CURDIR)/debian/patches/0003-Add-IBT-support.patch -d $(CURDIR)/debian/tmp/kernel-open
|
||||
patch -Np2 -i $(CURDIR)/debian/patches/0003-Add-IBT-support.patch -d debian/tmp/kernel
|
||||
patch -Np2 -i $(CURDIR)/debian/patches/0003-Add-IBT-support.patch -d debian/tmp/kernel-open
|
||||
|
||||
# Patch by Nvidia to silence error messages until a real fix drops in 570.xx
|
||||
# https://github.com/NVIDIA/open-gpu-kernel-modules/issues/716#issuecomment-2391898884
|
||||
patch -Np1 -i $(CURDIR)/debian/patches/0004-silence-event-assert-until-570.patch -d $(CURDIR)/debian/tmp/kernel
|
||||
patch -Np1 -i $(CURDIR)/debian/patches/0004-silence-event-assert-until-570.patch -d $(CURDIR)/debian/tmp/kernel-open
|
||||
patch -Np2 -i $(CURDIR)/debian/patches/0004-silence-event-assert-until-570.patch -d debian/tmp/kernel
|
||||
patch -Np2 -i $(CURDIR)/debian/patches/0004-silence-event-assert-until-570.patch -d debian/tmp/kernel-open
|
||||
|
||||
# Patch by Nvidia to fix HDMI names which are otherwise broken in the /proc/asound/NVidia/* ELD files
|
||||
# Should hopefully ship with 570.xx
|
||||
# https://github.com/NVIDIA/open-gpu-kernel-modules/pull/715
|
||||
patch -Np1 -i $(CURDIR)/debian/patches/0005-nvkms-Sanitize-trim-ELD-product-name-strings.patch -d $(CURDIR)/debian/tmp/kernel
|
||||
patch -Np1 -i $(CURDIR)/debian/patches/0005-nvkms-Sanitize-trim-ELD-product-name-strings.patch -d $(CURDIR)/debian/tmp/kernel-open
|
||||
patch -Np2 -i $(CURDIR)/debian/patches/0005-nvkms-Sanitize-trim-ELD-product-name-strings.patch -d debian/tmp/kernel
|
||||
patch -Np2 -i $(CURDIR)/debian/patches/0005-nvkms-Sanitize-trim-ELD-product-name-strings.patch -d debian/tmp/kernel-open
|
||||
|
||||
# Fix build errors on 6.13+
|
||||
# https://github.com/NVIDIA/open-gpu-kernel-modules/issues/746
|
||||
patch -Np1 -i $(CURDIR)/debian/patches/0006-crypto-Add-fix-for-6.13-Module-compilation.patch -d $(CURDIR)/debian/tmp/kernel
|
||||
patch -Np1 -i $(CURDIR)/debian/patches/0006-crypto-Add-fix-for-6.13-Module-compilation.patch -d $(CURDIR)/debian/tmp/kernel-open
|
||||
patch -Np2 -i $(CURDIR)/debian/patches/0006-crypto-Add-fix-for-6.13-Module-compilation.patch -d debian/tmp/kernel
|
||||
patch -Np2 -i $(CURDIR)/debian/patches/0006-crypto-Add-fix-for-6.13-Module-compilation.patch -d debian/tmp/kernel-open
|
||||
|
||||
# https://github.com/NVIDIA/open-gpu-kernel-modules/issues/751
|
||||
patch -Np1 -i $(CURDIR)/debian/patches/0007-nvidia-nv-Convert-symbol-namespace-to-string-literal.patch -d $(CURDIR)/debian/tmp/kernel
|
||||
patch -Np1 -i $(CURDIR)/debian/patches/0007-nvidia-nv-Convert-symbol-namespace-to-string-literal.patch -d $(CURDIR)/debian/tmp/kernel-open
|
||||
patch -Np2 -i $(CURDIR)/debian/patches/0007-nvidia-nv-Convert-symbol-namespace-to-string-literal.patch -d debian/tmp/kernel
|
||||
patch -Np2 -i $(CURDIR)/debian/patches/0007-nvidia-nv-Convert-symbol-namespace-to-string-literal.patch -d debian/tmp/kernel-open
|
||||
|
||||
# https://github.com/NVIDIA/open-gpu-kernel-modules/issues/747
|
||||
patch -Np1 -i $(CURDIR)/debian/patches/0008-Kbuild-Use-absolute-paths-for-symbolic-links.patch -d $(CURDIR)/debian/tmp/kernel
|
||||
patch -Np1 -i $(CURDIR)/debian/patches/0008-Kbuild-Use-absolute-paths-for-symbolic-links.patch -d $(CURDIR)/debian/tmp/kernel-open
|
||||
patch -Np2 -i $(CURDIR)/debian/patches/0008-Kbuild-Use-absolute-paths-for-symbolic-links.patch -d debian/tmp/kernel
|
||||
patch -Np2 -i $(CURDIR)/debian/patches/0008-Kbuild-Use-absolute-paths-for-symbolic-links.patch -d debian/tmp/kernel-open
|
||||
|
||||
# Fixes fbdev on 6.13+
|
||||
# https://github.com/NVIDIA/open-gpu-kernel-modules/issues/749
|
||||
# https://gist.github.com/xtexChooser/da92d9df902788b75f746f348552ae80
|
||||
patch -Np1 -i $(CURDIR)/debian/patches/0009-FROM-AOSC-Use-linux-aperture.c-for-removing-conflict.patch -d $(CURDIR)/debian/tmp/kernel
|
||||
patch -Np1 -i $(CURDIR)/debian/patches/0009-FROM-AOSC-Use-linux-aperture.c-for-removing-conflict.patch -d $(CURDIR)/debian/tmp/kernel-open
|
||||
patch -Np1 -i $(CURDIR)/debian/patches/0010-FROM-AOSC-TTM-fbdev-emulation-for-Linux-6.13.patch -d $(CURDIR)/debian/tmp/kernel
|
||||
patch -Np1 -i $(CURDIR)/debian/patches/0010-FROM-AOSC-TTM-fbdev-emulation-for-Linux-6.13.patch -d $(CURDIR)/debian/tmp/kernel-open
|
||||
patch -Np2 -i $(CURDIR)/debian/patches/0009-FROM-AOSC-Use-linux-aperture.c-for-removing-conflict.patch -d debian/tmp/kernel
|
||||
patch -Np2 -i $(CURDIR)/debian/patches/0009-FROM-AOSC-Use-linux-aperture.c-for-removing-conflict.patch -d debian/tmp/kernel-open
|
||||
patch -Np2 -i $(CURDIR)/debian/patches/0010-FROM-AOSC-TTM-fbdev-emulation-for-Linux-6.13.patch -d debian/tmp/kernel
|
||||
patch -Np2 -i $(CURDIR)/debian/patches/0010-FROM-AOSC-TTM-fbdev-emulation-for-Linux-6.13.patch -d debian/tmp/kernel-open
|
||||
|
||||
# NVENC/NvFBC
|
||||
sed -i 's/\xe8\x35\x3e\xfe\xff\x85\xc0\x41\x89\xc4/\xe8\x35\x3e\xfe\xff\x29\xc0\x41\x89\xc4/g' "debian/tmp/libnvidia-encode.so.565.77"
|
||||
@ -82,48 +82,48 @@ ifeq (i386,$(DEB_HOST_ARCH))
|
||||
# This avoids various issue, when Simplefb is used
|
||||
# https://gitlab.archlinux.org/archlinux/packaging/packages/nvidia-utils/-/issues/14
|
||||
# https://github.com/rpmfusion/nvidia-kmod/blob/master/make_modeset_default.patch
|
||||
patch -Np2 -i $(CURDIR)/debian/patches/0001-Make-modeset-and-fbdev-default-enabled.patch -d $(CURDIR)/debian/tmp/kernel
|
||||
patch -Np2 -i $(CURDIR)/debian/patches/0001-Make-modeset-and-fbdev-default-enabled.patch -d $(CURDIR)/debian/tmp/kernel-open
|
||||
patch -Np1 -i $(CURDIR)/debian/patches/0001-Make-modeset-and-fbdev-default-enabled.patch -d debian/tmp/kernel/nvidia-drm
|
||||
patch -Np1 -i $(CURDIR)/debian/patches/0001-Make-modeset-and-fbdev-default-enabled.patch -d debian/tmp/kernel-open/nvidia-drm
|
||||
|
||||
# Dont error, when Zen5 CPU is in the system
|
||||
patch -Np2 -i $(CURDIR)/debian/patches/0002-Do-not-error-on-unkown-CPU-Type-and-add-Zen5-support.patch -d $(CURDIR)/debian/tmp/kernel
|
||||
patch -Np2 -i $(CURDIR)/debian/patches/0002-Do-not-error-on-unkown-CPU-Type-and-add-Zen5-support.patch -d $(CURDIR)/debian/tmp/kernel-open
|
||||
patch -Np2 -i $(CURDIR)/debian/patches/0002-Do-not-error-on-unkown-CPU-Type-and-add-Zen5-support.patch -d debian/tmp/kernel/nvidia
|
||||
patch -Np2 -i $(CURDIR)/debian/patches/0002-Do-not-error-on-unkown-CPU-Type-and-add-Zen5-support.patch -d debian/tmp/kernel-open/nvidia
|
||||
|
||||
# Fix for https://bugs.archlinux.org/task/74886
|
||||
patch -Np2 -i $(CURDIR)/debian/patches/0003-Add-IBT-support.patch -d $(CURDIR)/debian/tmp/kernel
|
||||
patch -Np2 -i $(CURDIR)/debian/patches/0003-Add-IBT-support.patch -d $(CURDIR)/debian/tmp/kernel-open
|
||||
patch -Np2 -i $(CURDIR)/debian/patches/0003-Add-IBT-support.patch -d debian/tmp/kernel
|
||||
patch -Np2 -i $(CURDIR)/debian/patches/0003-Add-IBT-support.patch -d debian/tmp/kernel-open
|
||||
|
||||
# Patch by Nvidia to silence error messages until a real fix drops in 570.xx
|
||||
# https://github.com/NVIDIA/open-gpu-kernel-modules/issues/716#issuecomment-2391898884
|
||||
patch -Np2 -i $(CURDIR)/debian/patches/0004-silence-event-assert-until-570.patch -d $(CURDIR)/debian/tmp/kernel
|
||||
patch -Np2 -i $(CURDIR)/debian/patches/0004-silence-event-assert-until-570.patch -d $(CURDIR)/debian/tmp/kernel-open
|
||||
patch -Np2 -i $(CURDIR)/debian/patches/0004-silence-event-assert-until-570.patch -d debian/tmp/kernel
|
||||
patch -Np2 -i $(CURDIR)/debian/patches/0004-silence-event-assert-until-570.patch -d debian/tmp/kernel-open
|
||||
|
||||
# Patch by Nvidia to fix HDMI names which are otherwise broken in the /proc/asound/NVidia/* ELD files
|
||||
# Should hopefully ship with 570.xx
|
||||
# https://github.com/NVIDIA/open-gpu-kernel-modules/pull/715
|
||||
patch -Np2 -i $(CURDIR)/debian/patches/0005-nvkms-Sanitize-trim-ELD-product-name-strings.patch -d $(CURDIR)/debian/tmp/kernel
|
||||
patch -Np2 -i $(CURDIR)/debian/patches/0005-nvkms-Sanitize-trim-ELD-product-name-strings.patch -d $(CURDIR)/debian/tmp/kernel-open
|
||||
patch -Np2 -i $(CURDIR)/debian/patches/0005-nvkms-Sanitize-trim-ELD-product-name-strings.patch -d debian/tmp/kernel
|
||||
patch -Np2 -i $(CURDIR)/debian/patches/0005-nvkms-Sanitize-trim-ELD-product-name-strings.patch -d debian/tmp/kernel-open
|
||||
|
||||
# Fix build errors on 6.13+
|
||||
# https://github.com/NVIDIA/open-gpu-kernel-modules/issues/746
|
||||
patch -Np2 -i $(CURDIR)/debian/patches/0006-crypto-Add-fix-for-6.13-Module-compilation.patch -d $(CURDIR)/debian/tmp/kernel
|
||||
patch -Np2 -i $(CURDIR)/debian/patches/0006-crypto-Add-fix-for-6.13-Module-compilation.patch -d $(CURDIR)/debian/tmp/kernel-open
|
||||
patch -Np2 -i $(CURDIR)/debian/patches/0006-crypto-Add-fix-for-6.13-Module-compilation.patch -d debian/tmp/kernel
|
||||
patch -Np2 -i $(CURDIR)/debian/patches/0006-crypto-Add-fix-for-6.13-Module-compilation.patch -d debian/tmp/kernel-open
|
||||
|
||||
# https://github.com/NVIDIA/open-gpu-kernel-modules/issues/751
|
||||
patch -Np2 -i $(CURDIR)/debian/patches/0007-nvidia-nv-Convert-symbol-namespace-to-string-literal.patch -d $(CURDIR)/debian/tmp/kernel
|
||||
patch -Np2 -i $(CURDIR)/debian/patches/0007-nvidia-nv-Convert-symbol-namespace-to-string-literal.patch -d $(CURDIR)/debian/tmp/kernel-open
|
||||
patch -Np2 -i $(CURDIR)/debian/patches/0007-nvidia-nv-Convert-symbol-namespace-to-string-literal.patch -d debian/tmp/kernel
|
||||
patch -Np2 -i $(CURDIR)/debian/patches/0007-nvidia-nv-Convert-symbol-namespace-to-string-literal.patch -d debian/tmp/kernel-open
|
||||
|
||||
# https://github.com/NVIDIA/open-gpu-kernel-modules/issues/747
|
||||
patch -Np2 -i $(CURDIR)/debian/patches/0008-Kbuild-Use-absolute-paths-for-symbolic-links.patch -d $(CURDIR)/debian/tmp/kernel
|
||||
patch -Np2 -i $(CURDIR)/debian/patches/0008-Kbuild-Use-absolute-paths-for-symbolic-links.patch -d $(CURDIR)/debian/tmp/kernel-open
|
||||
patch -Np2 -i $(CURDIR)/debian/patches/0008-Kbuild-Use-absolute-paths-for-symbolic-links.patch -d debian/tmp/kernel
|
||||
patch -Np2 -i $(CURDIR)/debian/patches/0008-Kbuild-Use-absolute-paths-for-symbolic-links.patch -d debian/tmp/kernel-open
|
||||
|
||||
# Fixes fbdev on 6.13+
|
||||
# https://github.com/NVIDIA/open-gpu-kernel-modules/issues/749
|
||||
# https://gist.github.com/xtexChooser/da92d9df902788b75f746f348552ae80
|
||||
patch -Np2 -i $(CURDIR)/debian/patches/0009-FROM-AOSC-Use-linux-aperture.c-for-removing-conflict.patch -d $(CURDIR)/debian/tmp/kernel
|
||||
patch -Np2 -i $(CURDIR)/debian/patches/0009-FROM-AOSC-Use-linux-aperture.c-for-removing-conflict.patch -d $(CURDIR)/debian/tmp/kernel-open
|
||||
patch -Np2 -i $(CURDIR)/debian/patches/0010-FROM-AOSC-TTM-fbdev-emulation-for-Linux-6.13.patch -d $(CURDIR)/debian/tmp/kernel
|
||||
patch -Np2 -i $(CURDIR)/debian/patches/0010-FROM-AOSC-TTM-fbdev-emulation-for-Linux-6.13.patch -d $(CURDIR)/debian/tmp/kernel-open
|
||||
patch -Np2 -i $(CURDIR)/debian/patches/0009-FROM-AOSC-Use-linux-aperture.c-for-removing-conflict.patch -d debian/tmp/kernel
|
||||
patch -Np2 -i $(CURDIR)/debian/patches/0009-FROM-AOSC-Use-linux-aperture.c-for-removing-conflict.patch -d debian/tmp/kernel-open
|
||||
patch -Np2 -i $(CURDIR)/debian/patches/0010-FROM-AOSC-TTM-fbdev-emulation-for-Linux-6.13.patch -d debian/tmp/kernel
|
||||
patch -Np2 -i $(CURDIR)/debian/patches/0010-FROM-AOSC-TTM-fbdev-emulation-for-Linux-6.13.patch -d debian/tmp/kernel-open
|
||||
|
||||
# Replace libs with 32 bit
|
||||
rm -rf debian/tmp/*.so*
|
||||
|
Loading…
x
Reference in New Issue
Block a user