[nvidia-340xx-kmod/f35] Patch for kernel-5.14.0

commit 6532cdd0ace61d978100e27e20cf1df6df0434ec Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com&gt; Date: Thu Nov 11 13:53:02 2021 +0100 Patch for kernel-5.14.0 kernel-5.14.patch | 148 +++++++++++++++++++++++++++++++++++++++++++++++++ nvidia-340xx-kmod.spec | 7 ++- 2 files changed, 154 insertions(+), 1 deletion(-) --- diff --git a/kernel-5.14.patch b/kernel-5.14.patch new file mode 100644 index 0000000..cbc8d63 --- /dev/null +++ b/kernel-5.14.patch @@ -0,0 +1,148 @@ +diff --git a/kernel/conftest.Kbuild b/kernel/conftest.Kbuild +index 69643cd..1778e87 100644 +--- a/kernel/conftest.Kbuild ++++ b/kernel/conftest.Kbuild +@@ -87,6 +87,7 @@ NV_CONFTEST_TYPE_COMPILE_TESTS += drm_driver_prime_flag_present + + NV_CONFTEST_TYPE_COMPILE_TESTS += mm_has_mmap_lock + NV_CONFTEST_TYPE_COMPILE_TESTS += drm_gem_object_vmap_has_map_arg ++NV_CONFTEST_TYPE_COMPILE_TESTS += drm_device_has_pdev + NV_CONFTEST_TYPE_COMPILE_TESTS += drm_mode_object_find_has_file_priv_arg + NV_CONFTEST_TYPE_COMPILE_TESTS += drm_prime_pages_to_sg_has_drm_device_arg + NV_CONFTEST_TYPE_COMPILE_TESTS += drm_gem_object_has_resv +diff --git a/kernel/conftest.sh b/kernel/conftest.sh +index f2e4c91..a21c5bd 100755 +--- a/kernel/conftest.sh ++++ b/kernel/conftest.sh +@@ -4654,6 +4654,29 @@ compile_test() { + + compile_check_conftest "$CODE" "NV_DRM_GEM_OBJECT_VMAP_HAS_MAP_ARG" "" "types" + ;; ++ ++ drm_device_has_pdev) ++ # ++ # Determine if the 'drm_device' structure has a 'pdev' field. ++ # ++ # Removed by commit b347e04452ff ("drm: Remove pdev field from ++ # struct drm_device") in v5.14-rc1. ++ # ++ CODE=" ++ #if defined(NV_DRM_DRMP_H_PRESENT) ++ #include <drm/drmP.h> ++ #endif ++ ++ #if defined(NV_DRM_DRM_DEVICE_H_PRESENT) ++ #include <drm/drm_device.h> ++ #endif ++ ++ int conftest_drm_device_has_pdev(void) { ++ return offsetof(struct drm_device, pdev); ++ }" ++ ++ compile_check_conftest "$CODE" "NV_DRM_DEVICE_HAS_PDEV" "" "types" ++ ;; + esac + } + +diff --git a/kernel/nv-drm.c b/kernel/nv-drm.c +index 9e0b9c5..45cab9b 100644 +--- a/kernel/nv-drm.c ++++ b/kernel/nv-drm.c +@@ -70,20 +70,35 @@ struct nv_gem_object { + struct page **pages; + }; + ++#if !defined(NV_DRM_DEVICE_HAS_PDEV) ++#include <drm/drm_legacy.h> ++struct nv_drm_extra_priv_data { ++ struct pci_dev *pdev; ++ struct drm_agp_head *agp; ++}; ++#endif ++ + static int nv_drm_load( + struct drm_device *dev, + unsigned long flags + ) + { + nv_linux_state_t *nvl; ++#if !defined(NV_DRM_DEVICE_HAS_PDEV) ++ struct nv_drm_extra_priv_data *extra = dev->dev_private; ++#endif + + for (nvl = nv_linux_devices; nvl != NULL; nvl = nvl->next) + { +- if (nvl->dev == dev->pdev) +- { +- nvl->drm = dev; +- return 0; +- } ++#if defined(NV_DRM_DEVICE_HAS_PDEV) ++ if (nvl->dev == dev->pdev) ++#else ++ if (nvl->dev == extra->pdev) ++#endif ++ { ++ nvl->drm = dev; ++ return 0; ++ } + } + + return -ENODEV; +@@ -100,11 +115,18 @@ static int __nv_drm_unload( + ) + { + nv_linux_state_t *nvl; ++#if !defined(NV_DRM_DEVICE_HAS_PDEV) ++ struct nv_drm_extra_priv_data *extra = dev->dev_private; ++#endif + + for (nvl = nv_linux_devices; nvl != NULL; nvl = nvl->next) + { +- if (nvl->dev == dev->pdev) +- { ++#if defined(NV_DRM_DEVICE_HAS_PDEV) ++ if (nvl->dev == dev->pdev) ++#else ++ if (nvl->dev == extra->pdev) ++#endif ++ { + BUG_ON(nvl->drm != dev); + nvl->drm = NULL; + return 0; +@@ -347,6 +369,7 @@ static void nv_drm_register_drm_device(const nv_gpu_info_t *gpu_info) + { + struct nv_drm_device *nv_dev = NULL; + struct drm_device *dev = NULL; ++ struct nv_drm_extra_priv_data *extra; + struct pci_dev *pdev = gpu_info->os_dev_ptr; + + DRM_DEBUG( +@@ -380,7 +403,14 @@ static void nv_drm_register_drm_device(const nv_gpu_info_t *gpu_info) + + dev->dev_private = nv_dev; + nv_dev->dev = dev; ++ ++#if defined(NV_DRM_DEVICE_HAS_PDEV) + dev->pdev = pdev; ++#else ++ extra = kzalloc(sizeof(*extra), GFP_KERNEL); ++ extra->pdev = pdev; ++ dev->dev_private = extra; ++#endif + + /* Register DRM device to DRM sub-system */ + +diff --git a/kernel/os-interface.c b/kernel/os-interface.c +index 0c0dc05..452609d 100644 +--- a/kernel/os-interface.c ++++ b/kernel/os-interface.c +@@ -549,7 +549,7 @@ RM_STATUS NV_API_CALL os_delay(NvU32 MilliSeconds) + // the requested timeout has expired, loop until less + // than a jiffie of the desired delay remains. + // +- current->state = TASK_INTERRUPTIBLE; ++ set_current_state(TASK_INTERRUPTIBLE); + do + { + schedule_timeout(jiffies); diff --git a/nvidia-340xx-kmod.spec b/nvidia-340xx-kmod.spec index d7c3ccc..5eae1a5 100644 --- a/nvidia-340xx-kmod.spec +++ b/nvidia-340xx-kmod.spec @@ -12,7 +12,7 @@ Name: nvidia-340xx-kmod Epoch: 1 Version: 340.108 # Taken over by kmodtool -Release: 14%{?dist} +Release: 15%{?dist} Summary: NVIDIA display driver kernel module Group: System Environment/Kernel License: Redistributable, no modification permitted @@ -25,6 +25,7 @@ Patch2: kernel-5.8.patch Patch3: kernel-5.9.patch Patch4: kernel-5.10.patch Patch5: kernel-5.11.patch +Patch6: kernel-5.14.patch BuildRequires: elfutils-libelf-devel BuildRequires: gcc @@ -56,6 +57,7 @@ tar --use-compress-program xz -xf %{_datadir}/%{name}-%{version}/%{name}-%{versi %patch3 -p1 %patch4 -p1 %patch5 -p1 +%patch6 -p1 %patch0 -p1 for kernel_version in %{?kernel_versions} ; do @@ -85,6 +87,9 @@ done %{?akmod_install} %changelog +* Thu Nov 11 2021 Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com&gt; - 1:340.108-15 +- Patch for kernel-5.14.0 + * Wed Aug 04 2021 RPM Fusion Release Engineering <leigh123linux(a)gmail.com&gt; - 1:340.108-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild