From 6238ff27cafbe0584fc7994ef0d13222beab6646 Mon Sep 17 00:00:00 2001 From: heitbaum Date: Sat, 4 Sep 2021 20:42:51 +1000 Subject: [PATCH] xf86-video-nvidia: update to 460.91.03 and patch for kernel 5.14 --- .../x11/driver/xf86-video-nvidia/package.mk | 4 +- .../patches/nvidia-fix-linux-5.14.patch | 63 +++++++++++++++++++ .../xf86-video-nvidia/udev.d/96-nvidia.rules | 29 +++++++++ 3 files changed, 94 insertions(+), 2 deletions(-) create mode 100644 packages/x11/driver/xf86-video-nvidia/patches/nvidia-fix-linux-5.14.patch diff --git a/packages/x11/driver/xf86-video-nvidia/package.mk b/packages/x11/driver/xf86-video-nvidia/package.mk index ac08b1050f..0e20b919db 100644 --- a/packages/x11/driver/xf86-video-nvidia/package.mk +++ b/packages/x11/driver/xf86-video-nvidia/package.mk @@ -6,8 +6,8 @@ PKG_NAME="xf86-video-nvidia" # Remember to run "python3 packages/x11/driver/xf86-video-nvidia/scripts/make_nvidia_udev.py" and commit changes to # "packages/x11/driver/xf86-video-nvidia/udev.d/96-nvidia.rules" whenever bumping version. # Host may require installation of python3-lxml and python3-requests packages. -PKG_VERSION="460.67" -PKG_SHA256="a19253cf805f913a3b53098587d557fb21c9b57b1568cb630e128ebb3276c10e" +PKG_VERSION="460.91.03" +PKG_SHA256="448156cfcef182ed6997c2754c472fd681bf7139b821d2adce1d847220c6c933" PKG_ARCH="x86_64" PKG_LICENSE="nonfree" PKG_SITE="http://www.nvidia.com/" diff --git a/packages/x11/driver/xf86-video-nvidia/patches/nvidia-fix-linux-5.14.patch b/packages/x11/driver/xf86-video-nvidia/patches/nvidia-fix-linux-5.14.patch new file mode 100644 index 0000000000..22da726f03 --- /dev/null +++ b/packages/x11/driver/xf86-video-nvidia/patches/nvidia-fix-linux-5.14.patch @@ -0,0 +1,63 @@ +From f18c541edc5e122b06b0c1e65d0a422f0b8109e7 Mon Sep 17 00:00:00 2001 +From: Joan Bruguera +Date: Fri, 2 Jul 2021 02:09:58 +0200 +Subject: [PATCH] Tentative fix for NVIDIA 465.31 driver for Linux 5.14-rc1 + +--- + kernel/common/inc/nv-time.h | 6 ++++++ + kernel/nvidia-drm/nvidia-drm-drv.c | 4 ++++ + 2 files changed, 10 insertions(+) + +diff --git a/kernel/common/inc/nv-time.h b/kernel/common/inc/nv-time.h +index dc80806..cc343a5 100644 +--- a/kernel/common/inc/nv-time.h ++++ b/kernel/common/inc/nv-time.h +@@ -23,6 +23,7 @@ + #ifndef __NV_TIME_H__ + #define __NV_TIME_H__ + ++#include + #include "conftest.h" + #include + #include +@@ -205,7 +206,12 @@ static inline NV_STATUS nv_sleep_ms(unsigned int ms) + // the requested timeout has expired, loop until less + // than a jiffie of the desired delay remains. + // ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 14, 0)) + current->state = TASK_INTERRUPTIBLE; ++#else ++ // Rel. commit "sched: Change task_struct::state" (Peter Zijlstra, Jun 11 2021) ++ WRITE_ONCE(current->__state, TASK_INTERRUPTIBLE); ++#endif + do + { + schedule_timeout(jiffies); +diff --git a/kernel/nvidia-drm/nvidia-drm-drv.c b/kernel/nvidia-drm/nvidia-drm-drv.c +index 84d4479..99ea552 100644 +--- a/kernel/nvidia-drm/nvidia-drm-drv.c ++++ b/kernel/nvidia-drm/nvidia-drm-drv.c +@@ -20,6 +20,7 @@ + * DEALINGS IN THE SOFTWARE. + */ + ++#include + #include "nvidia-drm-conftest.h" /* NV_DRM_AVAILABLE and NV_DRM_DRM_GEM_H_PRESENT */ + + #include "nvidia-drm-priv.h" +@@ -903,9 +904,12 @@ static void nv_drm_register_drm_device(const nv_gpu_info_t *gpu_info) + + dev->dev_private = nv_dev; + nv_dev->dev = dev; ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 14, 0)) ++ // Rel. commit "drm: Remove pdev field from struct drm_device" (Thomas Zimmermann, 3 May 2021) + if (device->bus == &pci_bus_type) { + dev->pdev = to_pci_dev(device); + } ++#endif + + /* Register DRM device to DRM sub-system */ + +-- +2.32.0 + diff --git a/packages/x11/driver/xf86-video-nvidia/udev.d/96-nvidia.rules b/packages/x11/driver/xf86-video-nvidia/udev.d/96-nvidia.rules index 60e2b00b77..71c8f3eb97 100644 --- a/packages/x11/driver/xf86-video-nvidia/udev.d/96-nvidia.rules +++ b/packages/x11/driver/xf86-video-nvidia/udev.d/96-nvidia.rules @@ -239,6 +239,7 @@ ATTR{device}=="0x1df6", GOTO="configure_nvidia" ATTR{device}=="0x1e02", GOTO="configure_nvidia" ATTR{device}=="0x1e04", GOTO="configure_nvidia" ATTR{device}=="0x1e07", GOTO="configure_nvidia" +ATTR{device}=="0x1e09", GOTO="configure_nvidia" ATTR{device}=="0x1e30", GOTO="configure_nvidia" ATTR{device}=="0x1e36", GOTO="configure_nvidia" ATTR{device}=="0x1e78", GOTO="configure_nvidia" @@ -291,14 +292,20 @@ ATTR{device}=="0x1f99", GOTO="configure_nvidia" ATTR{device}=="0x1f9c", GOTO="configure_nvidia" ATTR{device}=="0x1f9d", GOTO="configure_nvidia" ATTR{device}=="0x1fb0", GOTO="configure_nvidia" +ATTR{device}=="0x1fb1", GOTO="configure_nvidia" +ATTR{device}=="0x1fb2", GOTO="configure_nvidia" ATTR{device}=="0x1fb8", GOTO="configure_nvidia" ATTR{device}=="0x1fb9", GOTO="configure_nvidia" +ATTR{device}=="0x1fba", GOTO="configure_nvidia" ATTR{device}=="0x1fbb", GOTO="configure_nvidia" +ATTR{device}=="0x1fbc", GOTO="configure_nvidia" ATTR{device}=="0x1fdd", GOTO="configure_nvidia" ATTR{device}=="0x1ff9", GOTO="configure_nvidia" ATTR{device}=="0x20b0", GOTO="configure_nvidia" ATTR{device}=="0x20b1", GOTO="configure_nvidia" ATTR{device}=="0x20b2", GOTO="configure_nvidia" +ATTR{device}=="0x20b6", GOTO="configure_nvidia" +ATTR{device}=="0x20b7", GOTO="configure_nvidia" ATTR{device}=="0x20f1", GOTO="configure_nvidia" ATTR{device}=="0x2182", GOTO="configure_nvidia" ATTR{device}=="0x2184", GOTO="configure_nvidia" @@ -311,17 +318,39 @@ ATTR{device}=="0x21c4", GOTO="configure_nvidia" ATTR{device}=="0x21d1", GOTO="configure_nvidia" ATTR{device}=="0x2204", GOTO="configure_nvidia" ATTR{device}=="0x2206", GOTO="configure_nvidia" +ATTR{device}=="0x2208", GOTO="configure_nvidia" +ATTR{device}=="0x2216", GOTO="configure_nvidia" ATTR{device}=="0x2230", GOTO="configure_nvidia" +ATTR{device}=="0x2231", GOTO="configure_nvidia" ATTR{device}=="0x2235", GOTO="configure_nvidia" +ATTR{device}=="0x2236", GOTO="configure_nvidia" +ATTR{device}=="0x2237", GOTO="configure_nvidia" +ATTR{device}=="0x2482", GOTO="configure_nvidia" ATTR{device}=="0x2484", GOTO="configure_nvidia" ATTR{device}=="0x2486", GOTO="configure_nvidia" +ATTR{device}=="0x2488", GOTO="configure_nvidia" +ATTR{device}=="0x2489", GOTO="configure_nvidia" ATTR{device}=="0x249c", GOTO="configure_nvidia" ATTR{device}=="0x249d", GOTO="configure_nvidia" +ATTR{device}=="0x24b0", GOTO="configure_nvidia" +ATTR{device}=="0x24b6", GOTO="configure_nvidia" +ATTR{device}=="0x24b7", GOTO="configure_nvidia" +ATTR{device}=="0x24b8", GOTO="configure_nvidia" ATTR{device}=="0x24dc", GOTO="configure_nvidia" ATTR{device}=="0x24dd", GOTO="configure_nvidia" ATTR{device}=="0x2503", GOTO="configure_nvidia" +ATTR{device}=="0x2504", GOTO="configure_nvidia" ATTR{device}=="0x2520", GOTO="configure_nvidia" +ATTR{device}=="0x2523", GOTO="configure_nvidia" ATTR{device}=="0x2560", GOTO="configure_nvidia" +ATTR{device}=="0x2563", GOTO="configure_nvidia" +ATTR{device}=="0x25a0", GOTO="configure_nvidia" +ATTR{device}=="0x25a2", GOTO="configure_nvidia" +ATTR{device}=="0x25a5", GOTO="configure_nvidia" +ATTR{device}=="0x25b8", GOTO="configure_nvidia" +ATTR{device}=="0x25e0", GOTO="configure_nvidia" +ATTR{device}=="0x25e2", GOTO="configure_nvidia" +ATTR{device}=="0x25e5", GOTO="configure_nvidia" GOTO="configure_nvidia-legacy" LABEL="configure_nvidia"