[xorg-x11-drv-nvidia/f40: 3/3] Merge branch 'master' into f40
by Leigh Scott
commit a9db35ca178372e65efd6d00b08deed582b39dcd
Merge: a7fc304 ba57004
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sun Dec 15 10:23:25 2024 +0000
Merge branch 'master' into f40
xorg-x11-drv-nvidia.spec | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
---
3 weeks, 2 days
[xorg-x11-drv-nvidia] Boolean 'or' statements still breaks mash
by Leigh Scott
commit ba570044316c594d8af6f96424a5a9fb293567b9
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sun Dec 15 10:22:30 2024 +0000
Boolean 'or' statements still breaks mash
xorg-x11-drv-nvidia.spec | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec
index 311710b..0cfca5d 100644
--- a/xorg-x11-drv-nvidia.spec
+++ b/xorg-x11-drv-nvidia.spec
@@ -23,7 +23,7 @@
Name: xorg-x11-drv-nvidia
Epoch: 3
Version: 565.77
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
License: Redistributable, no modification permitted
@@ -114,7 +114,7 @@ Requires: nvidia-modprobe%{?_isa} = %{?epoch}:%{version}
%ifarch x86_64
Requires: (%{name}-cuda-libs(x86-32) = %{?epoch}:%{version}-%{release} if mesa-libGL(x86-32))
%endif
-Requires: (ocl-icd%{?_isa} or OpenCL-ICD-Loader%{?_isa})
+Requires: libOpenCL.so.1()(64bit)
Requires: opencl-filesystem
Conflicts: xorg-x11-drv-nvidia-340xx-cuda
@@ -596,6 +596,9 @@ fi ||:
%endif
%changelog
+* Sun Dec 15 2024 Leigh Scott <leigh123linux(a)gmail.com> - 3:565.77-3
+- Boolean 'or' statements still breaks mash
+
* Sun Dec 15 2024 Leigh Scott <leigh123linux(a)gmail.com> - 3:565.77-2
- Adapt for new OpenCL-ICD-Loader package
3 weeks, 2 days
[xorg-x11-drv-nvidia] Adapt for new OpenCL-ICD-Loader package
by Leigh Scott
commit f29b7ef939c349ba3cbecfa8721a4f68dd85b4a7
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sun Dec 15 09:32:05 2024 +0000
Adapt for new OpenCL-ICD-Loader package
xorg-x11-drv-nvidia.spec | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec
index ec1f319..311710b 100644
--- a/xorg-x11-drv-nvidia.spec
+++ b/xorg-x11-drv-nvidia.spec
@@ -23,7 +23,7 @@
Name: xorg-x11-drv-nvidia
Epoch: 3
Version: 565.77
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
License: Redistributable, no modification permitted
@@ -114,7 +114,7 @@ Requires: nvidia-modprobe%{?_isa} = %{?epoch}:%{version}
%ifarch x86_64
Requires: (%{name}-cuda-libs(x86-32) = %{?epoch}:%{version}-%{release} if mesa-libGL(x86-32))
%endif
-Requires: ocl-icd%{?_isa}
+Requires: (ocl-icd%{?_isa} or OpenCL-ICD-Loader%{?_isa})
Requires: opencl-filesystem
Conflicts: xorg-x11-drv-nvidia-340xx-cuda
@@ -596,6 +596,9 @@ fi ||:
%endif
%changelog
+* Sun Dec 15 2024 Leigh Scott <leigh123linux(a)gmail.com> - 3:565.77-2
+- Adapt for new OpenCL-ICD-Loader package
+
* Thu Dec 05 2024 Leigh Scott <leigh123linux(a)gmail.com> - 3:565.77-1
- Update to 565.77 release
3 weeks, 2 days
[nvidia-390xx-kmod] Update Release number and changelog in SPEC file
by Nicolas Viéville
commit 93cffbdb99a2c0f3dbf4ed06dbb52ad3271aec85
Author: Nicolas Viéville <nicolas.vieville(a)uphf.fr>
Date: Sat Dec 14 11:16:59 2024 +0100
Update Release number and changelog in SPEC file
Signed-off-by: Nicolas Viéville <nicolas.vieville(a)uphf.fr>
nvidia-390xx-kmod.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/nvidia-390xx-kmod.spec b/nvidia-390xx-kmod.spec
index 44e3ed0..8818d70 100644
--- a/nvidia-390xx-kmod.spec
+++ b/nvidia-390xx-kmod.spec
@@ -18,7 +18,7 @@ Name: nvidia-390xx-kmod
Epoch: 3
Version: 390.157
# Taken over by kmodtool
-Release: 12%{?dist}
+Release: 13%{?dist}
Summary: NVIDIA 390xx display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -264,6 +264,9 @@ done
%changelog
+* Sat Dec 14 2024 Nicolas Viéville <nicolas.vieville(a)uphf.fr> - 3:390.157-13
+- Add patch for kernel >= 6.12
+
* Sat Oct 05 2024 Nicolas Viéville <nicolas.vieville(a)uphf.fr> - 3:390.157-12
- Fix for 'index 0 is out of range for type 'uvm_gpu_chunk_t *[*]' and
uvm_page_directory_t *[*]' traces from kernel 6.8.x - RFBZ#7069
3 weeks, 3 days
[nvidia-390xx-kmod] Add patch for kernel >= 6.12
by Nicolas Viéville
commit cc27e18564a742aba93f82b186476c4180b27b68
Author: Nicolas Viéville <nicolas.vieville(a)uphf.fr>
Date: Sat Dec 14 11:16:14 2024 +0100
Add patch for kernel >= 6.12
Signed-off-by: Nicolas Viéville <nicolas.vieville(a)uphf.fr>
...6.12-removed-output_poll_changed-function.patch | 93 ++++++++++++++++++++++
nvidia-390xx-kmod.spec | 2 +
2 files changed, 95 insertions(+)
---
diff --git a/nvidia-390xx-kmod-0093-kernel-6.12-removed-output_poll_changed-function.patch b/nvidia-390xx-kmod-0093-kernel-6.12-removed-output_poll_changed-function.patch
new file mode 100644
index 0000000..f793562
--- /dev/null
+++ b/nvidia-390xx-kmod-0093-kernel-6.12-removed-output_poll_changed-function.patch
@@ -0,0 +1,93 @@
+From 31ff660e7b4bed917d1f63e9e7836f4e33237652 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Nicolas=20Vi=C3=A9ville?= <nicolas.vieville(a)uphf.fr>
+Date: Sat, 14 Dec 2024 08:57:27 +0100
+Subject: [PATCH] Linux 6.12: drm_mode_config_funcs.output_poll_changed
+ function removed, then add compile_check_conftest case in conftest.h and
+ tests in sources
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Nicolas Viéville <nicolas.vieville(a)uphf.fr>
+---
+ kernel/conftest.sh | 23 +++++++++++++++++++++++
+ kernel/nvidia-drm/nvidia-drm-drv.c | 4 ++++
+ kernel/nvidia-drm/nvidia-drm.Kbuild | 1 +
+ 3 files changed, 28 insertions(+)
+
+diff --git a/kernel/conftest.sh b/kernel/conftest.sh
+index 72cf3ec..b918bf6 100755
+--- a/kernel/conftest.sh
++++ b/kernel/conftest.sh
+@@ -4586,6 +4586,29 @@ compile_test() {
+
+ compile_check_conftest "$CODE" "NV_ACPI_VIDEO_BACKLIGHT_USE_NATIVE" "" "functions"
+ ;;
++
++ drm_output_poll_changed)
++ #
++ # Determine whether drm_mode_config_funcs.output_poll_changed
++ # callback is present
++ #
++ # Removed by commit 446d0f4849b1 ("drm: Remove struct
++ # drm_mode_config_funcs.output_poll_changed") in v6.12. Hotplug
++ # event support is handled through the fbdev emulation interface
++ # going forward.
++ #
++ CODE="
++ #if defined(NV_DRM_DRM_MODE_CONFIG_H_PRESENT)
++ #include <drm/drm_mode_config.h>
++ #else
++ #include <drm/drm_crtc.h>
++ #endif
++ int conftest_drm_output_poll_changed_available(void) {
++ return offsetof(struct drm_mode_config_funcs, output_poll_changed);
++ }"
++
++ compile_check_conftest "$CODE" "NV_DRM_OUTPUT_POLL_CHANGED_PRESENT" "" "types"
++ ;;
+ esac
+ }
+
+diff --git a/kernel/nvidia-drm/nvidia-drm-drv.c b/kernel/nvidia-drm/nvidia-drm-drv.c
+index f649202..93cf692 100644
+--- a/kernel/nvidia-drm/nvidia-drm-drv.c
++++ b/kernel/nvidia-drm/nvidia-drm-drv.c
+@@ -88,6 +88,7 @@ static struct nv_drm_device *dev_list = NULL;
+
+ #if defined(NV_DRM_ATOMIC_MODESET_AVAILABLE)
+
++#if defined(NV_DRM_OUTPUT_POLL_CHANGED_PRESENT)
+ static void nv_drm_output_poll_changed(struct drm_device *dev)
+ {
+ struct drm_connector *connector = NULL;
+@@ -131,6 +132,7 @@ static void nv_drm_output_poll_changed(struct drm_device *dev)
+ nv_drm_connector_list_iter_end(&conn_iter);
+ #endif
+ }
++#endif /* NV_DRM_OUTPUT_POLL_CHANGED_PRESENT */
+
+ static struct drm_framebuffer *nv_drm_framebuffer_create(
+ struct drm_device *dev,
+@@ -168,7 +170,9 @@ static const struct drm_mode_config_funcs nv_mode_config_funcs = {
+ .atomic_check = nv_drm_atomic_check,
+ .atomic_commit = nv_drm_atomic_commit,
+
++ #if defined(NV_DRM_OUTPUT_POLL_CHANGED_PRESENT)
+ .output_poll_changed = nv_drm_output_poll_changed,
++ #endif
+ };
+
+ static void nv_drm_event_callback(const struct NvKmsKapiEvent *event)
+diff --git a/kernel/nvidia-drm/nvidia-drm.Kbuild b/kernel/nvidia-drm/nvidia-drm.Kbuild
+index cb49130..4dfc721 100644
+--- a/kernel/nvidia-drm/nvidia-drm.Kbuild
++++ b/kernel/nvidia-drm/nvidia-drm.Kbuild
+@@ -107,3 +107,4 @@ NV_CONFTEST_TYPE_COMPILE_TESTS += drm_device_has_pdev
+ NV_CONFTEST_TYPE_COMPILE_TESTS += dma_resv_add_fence
+ NV_CONFTEST_TYPE_COMPILE_TESTS += dma_resv_reserve_fences
+ NV_CONFTEST_TYPE_COMPILE_TESTS += reservation_object_reserve_shared_has_num_fences_arg
++NV_CONFTEST_TYPE_COMPILE_TESTS += drm_output_poll_changed
+--
+2.47.1
+
diff --git a/nvidia-390xx-kmod.spec b/nvidia-390xx-kmod.spec
index bafe256..44e3ed0 100644
--- a/nvidia-390xx-kmod.spec
+++ b/nvidia-390xx-kmod.spec
@@ -106,6 +106,7 @@ Patch155: nvidia-390xx-kmod-0089-kernel-6.10-removed-follow_pfn-function.patch
Patch156: nvidia-390xx-kmod-0090-fix_warning_suggested_braces_around_empty_body_in_if.patch
Patch157: nvidia-390xx-kmod-0091-fix_warning_old_style_declaration_.patch
Patch158: nvidia-390xx-kmod-0092-fix_index_0_is_out_of_range_kernel_6.8_traces.patch
+Patch159: nvidia-390xx-kmod-0093-kernel-6.12-removed-output_poll_changed-function.patch
# build system updates
Patch30: use-kbuild-compiler.patch
@@ -227,6 +228,7 @@ tar --use-compress-program xz -xf %{_datadir}/%{name}-%{version}/%{name}-%{versi
%patch -P 156 -p1 -b 156
%patch -P 157 -p1 -b 157
%patch -P 158 -p1 -b 158
+%patch -P 159 -p1 -b 159
%ifarch armv7hl
%patch -P 40 -p1 -b 40 -d kernel
3 weeks, 3 days
