Add temporary fix for Vulkan+PRIME on Wayland

It should be removed for driver v550 and later! For more details, see NVIDIA/egl-wayland#72 (comment) Signed-off-by: Pavel Artsishevsky <[email protected]>
rpmfusion · Dec 7, 2023 · fde0a26 · fde0a26
1 parent 82c7c7d
commit fde0a26
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/fix_vulkan_on_wayland_prime.patch b/fix_vulkan_on_wayland_prime.patch
@@ -0,0 +1,13 @@
+diff --git a/./kernel/nvidia-drm/nvidia-drm-drv.c b/./kernel-open/nvidia-drm/nvidia-drm-drv.c
+index e0ddb6c..42d24f8 100644
+--- a/./kernel/nvidia-drm/nvidia-drm-drv.c
++++ b/./kernel-open/nvidia-drm/nvidia-drm-drv.c
+@@ -747,7 +747,7 @@ static int nv_drm_get_dev_info_ioctl(struct drm_device *dev,
+
+         if (nv_dev->semsurf_stride != 0) {
+             params->supports_semsurf = true;
+-#if defined(NV_SYNC_FILE_GET_FENCE_PRESENT)
++#if 0
+             params->supports_sync_fd = true;
+ #endif /* defined(NV_SYNC_FILE_GET_FENCE_PRESENT) */
+         }
diff --git a/nvidia-kmod.spec b/nvidia-kmod.spec
@@ -12,13 +12,16 @@ Name:          nvidia-kmod
 Epoch:         3
 Version:       545.29.06
 # Taken over by kmodtool
-Release:       1%{?dist}
+Release:       2%{?dist}
 Summary:       NVIDIA display driver kernel module
 License:       Redistributable, no modification permitted
 URL:           https://www.nvidia.com/
 
 Source11:      nvidia-kmodtool-excludekernel-filterfile
 Patch0:        make_modeset_default.patch
+# Temporary fix for Vulkan+PRIME on Wayland. Remove it for driver v550!
+# See https://github.com/NVIDIA/egl-wayland/issues/72#issuecomment-1843446296
+Patch1:        fix_vulkan_on_wayland_prime.patch
 
 # needed for plague to make sure it builds for i586 and i686
 ExclusiveArch:  x86_64 aarch64
@@ -52,6 +55,7 @@ echo "Using original nvidia defaults"
 %else
 echo "Set nvidia to fbdev=1 modeset=1"
 %patch -P0 -p1
+%patch -P1 -p1
 %endif
 
 for kernel_version  in %{?kernel_versions} ; do