[nvidia-settings-390xx] Update to 390.157
by Henrik Nordström
commit 89876c9e2183c1c237a2b13958377007584d1d09
Author: Henrik Nordström <henrik(a)hno.se>
Date: Sat Jan 7 20:02:04 2023 +0100
Update to 390.157
.gitignore | 12 +-----------
nvidia-settings-390xx.spec | 2 +-
sources | 2 +-
3 files changed, 3 insertions(+), 13 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a61b0a2..9db3616 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,11 +1 @@
-/nvidia-settings-390.87.tar.bz2
-/nvidia-settings-390.116.tar.bz2
-/nvidia-settings-390.129.tar.bz2
-/nvidia-settings-390.132.tar.bz2
-/nvidia-settings-390.138.tar.bz2
-/nvidia-settings-390.141.tar.bz2
-/nvidia-settings-390.143.tar.bz2
-/nvidia-settings-390.144.tar.bz2
-/nvidia-settings-390.147.tar.bz2
-/nvidia-settings-390.151.tar.bz2
-/nvidia-settings-390.154.tar.bz2
+/nvidia-settings-390.157.tar.bz2
diff --git a/nvidia-settings-390xx.spec b/nvidia-settings-390xx.spec
index f6f2728..dbf2e60 100644
--- a/nvidia-settings-390xx.spec
+++ b/nvidia-settings-390xx.spec
@@ -1,5 +1,5 @@
Name: nvidia-settings-390xx
-Version: 390.154
+Version: 390.157
Release: 1%{?dist}
Summary: Configure the NVIDIA 390xx series graphics driver
diff --git a/sources b/sources
index 6fda4ea..0c44a53 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (nvidia-settings-390.154.tar.bz2) = 95321bffb6e6af7971ee0705a73ee3388cdb84dfd32e799d63c5b36e5c3ddd45de4091349d35c6af279a9aa6fea30b0ec0cb19b940e5b356768c580d8488d2df
+SHA512 (nvidia-settings-390.157.tar.bz2) = b16699009bf56a1ff3b623a528c58061c4f5a2c5c4a373756a07bcd667743a1df7c733a572d2d0baa835a904ac2fda8a5c85890dcc00c3a0f223e0467aea902d
1 year, 4 months
[nvidia-390xx-kmod] 390.157
by Henrik Nordström
commit c23b3762059eac6e1e8d06a9547f5ab4d4a91bf0
Author: Henrik Nordström <henrik(a)hno.se>
Date: Sat Jan 7 19:59:39 2023 +0100
390.157
kernel-4.16+-memory-encryption.patch | 33 +++++++++++++++++++++++++++++++++
nvidia-390xx-kmod.spec | 30 ++++++++++++++++++------------
2 files changed, 51 insertions(+), 12 deletions(-)
---
diff --git a/kernel-4.16+-memory-encryption.patch b/kernel-4.16+-memory-encryption.patch
new file mode 100644
index 0000000..737295c
--- /dev/null
+++ b/kernel-4.16+-memory-encryption.patch
@@ -0,0 +1,33 @@
+diff --git a/kernel/common/inc/nv-linux.h b/kernel/common/inc/nv-linux.h
+index 10fc418..22ef968 100644
+--- a/kernel/common/inc/nv-linux.h
++++ b/kernel/common/inc/nv-linux.h
+@@ -174,7 +174,11 @@ static inline uid_t __kuid_val(kuid_t uid)
+
+ #if defined(NV_VM_INSERT_PAGE_PRESENT)
+ #include <linux/pagemap.h>
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0)
+ #include <linux/dma-mapping.h>
++#else
++#include <linux/dma-direct.h>
++#endif
+
+ #if defined(NV_LINUX_DMA_MAP_OPS_H_PRESENT)
+ #include <linux/dma-map-ops.h>
+diff --git a/kernel/conftest.sh b/kernel/conftest.sh
+index b23dbb4..42dc576 100755
+--- a/kernel/conftest.sh
++++ b/kernel/conftest.sh
+@@ -2056,7 +2056,12 @@ compile_test() {
+ # Determine if the phys_to_dma function is present.
+ #
+ CODE="
++ #include <linux/version.h>
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0)
+ #include <linux/dma-mapping.h>
++#else
++ #include <linux/dma-direct.h>
++#endif
+ void conftest_phys_to_dma(void) {
+ phys_to_dma();
+ }"
diff --git a/nvidia-390xx-kmod.spec b/nvidia-390xx-kmod.spec
index e6ed90f..e60d174 100644
--- a/nvidia-390xx-kmod.spec
+++ b/nvidia-390xx-kmod.spec
@@ -16,9 +16,9 @@
Name: nvidia-390xx-kmod
Epoch: 3
-Version: 390.154
+Version: 390.157
# Taken over by kmodtool
-Release: 3%{?dist}
+Release: 1%{?dist}
Summary: NVIDIA 390xx display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -35,11 +35,13 @@ Source11: nvidia-390xx-kmodtool-excludekernel-filterfile
# kernel support
Patch12: do-div-cast.patch
Patch13: 0018-backport-nv_install_notifier-changes-from-418.30.patch
-Patch14: 0019-backport-acpi-changes-from-430.09.patch
-Patch15: 0020-backport-acpi-changes-from-455.23.04.patch
-Patch16: 0021-backport-acpi-changes-from-510.85.02.patch
-Patch17: 0022-backport-acpi-changes-from-515.65.01.patch
-Patch18: 0023-backport-drm_frambuffer.h-changes-from-515.76.patch
+#Patch14: 0019-backport-acpi-changes-from-430.09.patch
+#Patch15: 0020-backport-acpi-changes-from-455.23.04.patch
+#Patch16: 0021-backport-acpi-changes-from-510.85.02.patch
+#Patch17: 0022-backport-acpi-changes-from-515.65.01.patch
+#Patch18: 0023-backport-drm_frambuffer.h-changes-from-515.76.patch
+#Copied from Arch
+Patch19: kernel-4.16+-memory-encryption.patch
# build system updates
Patch30: use-kbuild-compiler.patch
@@ -77,11 +79,12 @@ tar --use-compress-program xz -xf %{_datadir}/%{name}-%{version}/%{name}-%{versi
# Apply patches
%patch12 -p1 -b 12 -d kernel
%patch13 -p1 -b 13 -d kernel
-%patch14 -p1 -b 14 -d kernel
-%patch15 -p1 -b 15 -d kernel
-%patch16 -p1 -b 16 -d kernel
-%patch17 -p1 -b 17 -d kernel
-%patch18 -p1 -b 18 -d kernel
+#patch14 -p1 -b 14 -d kernel
+#patch15 -p1 -b 15 -d kernel
+#patch16 -p1 -b 16 -d kernel
+#patch17 -p1 -b 17 -d kernel
+#patch18 -p1 -b 18 -d kernel
+%patch19 -p1 -b 19
%patch30 -p1 -b 30 -d kernel
%patch31 -p1 -b 31 -d kernel
@@ -119,6 +122,9 @@ done
%changelog
+* Sat Jan 07 2023 Henrik Nordstrom <henrik(a)henriknordstrom.net> - 3:390.157-1
+- Update to 390.157
+
* Thu Nov 03 2022 Leigh Scott <leigh123linux(a)gmail.com> - 3:390.154-3
- Patch for 6.0 kernel
- Clean up old patches
1 year, 4 months
[xorg-x11-drv-nvidia-390xx] 390.157
by Henrik Nordström
commit 50967efac432a1e2bb1e38ad135b650f2bad64cc
Author: Henrik Nordström <henrik(a)hno.se>
Date: Sat Jan 7 19:35:09 2023 +0100
390.157
xorg-x11-drv-nvidia-390xx.spec | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/xorg-x11-drv-nvidia-390xx.spec b/xorg-x11-drv-nvidia-390xx.spec
index 988be20..fc88332 100644
--- a/xorg-x11-drv-nvidia-390xx.spec
+++ b/xorg-x11-drv-nvidia-390xx.spec
@@ -23,7 +23,7 @@
Name: xorg-x11-drv-nvidia-390xx
Epoch: 3
Version: 390.157
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: NVIDIA's 390xx series proprietary display driver for NVIDIA graphic cards
License: Redistributable, no modification permitted
@@ -559,7 +559,7 @@ fi ||:
%{_libdir}/libnvidia-encode.so
%changelog
-* Sat Jan 07 2023 Henrik Nordstrom <henrik(a)henriknordstrom.net> - 3:390.157-1
+* Sat Jan 07 2023 Henrik Nordstrom <henrik(a)henriknordstrom.net> - 3:390.157-2
- Update to 390.157 release
* Sun Aug 28 2022 Leigh Scott <leigh123linux(a)gmail.com> - 3:390.154-1
1 year, 4 months
[xorg-x11-drv-nvidia-390xx] 390.157
by Henrik Nordström
commit 3c52a1d718a5db04c94969ab197153bfa864406a
Author: Henrik Nordström <henrik(a)hno.se>
Date: Sat Jan 7 19:34:09 2023 +0100
390.157
xorg-x11-drv-nvidia-390xx.spec | 3 +++
1 file changed, 3 insertions(+)
---
diff --git a/xorg-x11-drv-nvidia-390xx.spec b/xorg-x11-drv-nvidia-390xx.spec
index aafb9bd..988be20 100644
--- a/xorg-x11-drv-nvidia-390xx.spec
+++ b/xorg-x11-drv-nvidia-390xx.spec
@@ -559,6 +559,9 @@ fi ||:
%{_libdir}/libnvidia-encode.so
%changelog
+* Sat Jan 07 2023 Henrik Nordstrom <henrik(a)henriknordstrom.net> - 3:390.157-1
+- Update to 390.157 release
+
* Sun Aug 28 2022 Leigh Scott <leigh123linux(a)gmail.com> - 3:390.154-1
- Update to 390.154 release
1 year, 4 months
[xorg-x11-drv-nvidia-390xx] Update to 390.157 release
by Henrik Nordström
commit 643b9bf88b027cdac2871792185b13deea686842
Author: Henrik Nordström <henrik(a)hno.se>
Date: Sat Jan 7 19:20:08 2023 +0100
Update to 390.157 release
.gitignore | 3 +++
sources | 6 +++---
xorg-x11-drv-nvidia-390xx.spec | 2 +-
3 files changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index fa44e73..90c551d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,3 +31,6 @@
/NVIDIA-Linux-x86-390.154.run
/NVIDIA-Linux-x86_64-390.154.run
/NVIDIA-Linux-armv7l-gnueabihf-390.154.run
+/NVIDIA-Linux-armv7l-gnueabihf-390.157.run
+/NVIDIA-Linux-x86-390.157.run
+/NVIDIA-Linux-x86_64-390.157.run
diff --git a/sources b/sources
index ffa9bfb..17167a4 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (NVIDIA-Linux-x86-390.154.run) = 5064ae135d099a4b8b81cf4d29f0cc0dcbcd93f13cadb0378f5e20eefad47522bdab42c9130f22ac8a22a4bef22365321cb35dc53b0ba35374e2bedd44e5a5c2
-SHA512 (NVIDIA-Linux-x86_64-390.154.run) = cab7de6db783089c1e385da0296c43d2cbbe266bac2bc177044e279224a6ef9c76495b46c4b7056eb5a82b21932a2002e0c12f7659b446a2586f9df30a69a9a3
-SHA512 (NVIDIA-Linux-armv7l-gnueabihf-390.154.run) = 461ff785a16a82d20d4709f8191c9bb37a71fff79936666ee4101ca40f330aecd8b49263fdd315ea3a92b60b855642dbd6ba7b33446d28c53705d634f0409676
+SHA512 (NVIDIA-Linux-armv7l-gnueabihf-390.157.run) = 5216333217a5866fd299bc75804e3a8db3e0928bfe635321ed39891c5842759ffae665a5e0fb587a54e625b11976d067351c93155c35cf8a067b575be9d3ec8c
+SHA512 (NVIDIA-Linux-x86-390.157.run) = dae9ac2c12f9ad90f7441e00e01a984147c577892421911d7f67f6a31e616ac1cb7d434bc9c7f58fbd9b8ae909521b5bece607a63c79588c0bb9d99c6bad5fb0
+SHA512 (NVIDIA-Linux-x86_64-390.157.run) = 4780503a4cff0180b1b1f37d20a6ba3438dd78b51fa7f69b98d35521835e5d61099129746929d51d63afa2d47b672b3e145e1e1897584dc3799e7f822c5b3a0a
diff --git a/xorg-x11-drv-nvidia-390xx.spec b/xorg-x11-drv-nvidia-390xx.spec
index e2d1e5c..aafb9bd 100644
--- a/xorg-x11-drv-nvidia-390xx.spec
+++ b/xorg-x11-drv-nvidia-390xx.spec
@@ -22,7 +22,7 @@
Name: xorg-x11-drv-nvidia-390xx
Epoch: 3
-Version: 390.154
+Version: 390.157
Release: 1%{?dist}
Summary: NVIDIA's 390xx series proprietary display driver for NVIDIA graphic cards
1 year, 4 months