Merge pull request #6762 from SupervisedThinking/up_nvidia

[le11] nvidia updates
This commit is contained in:
CvH 2022-08-05 21:15:20 +02:00 committed by GitHub
commit 926542d9df
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 26 deletions

View File

@ -2,8 +2,8 @@
# Copyright (C) 2021-present Team LibreELEC (https://libreelec.tv) # Copyright (C) 2021-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="nvidia" PKG_NAME="nvidia"
PKG_VERSION="515.57" PKG_VERSION="515.65.01"
PKG_SHA256="f05d782baca1ba681f8e417768338176875fb8bc0b687ce576daa4dc1f437f64" PKG_SHA256="89e9c22b3903a2360bb18a7f1220dc52234b2cb928bb9dd6690236cf2b024695"
PKG_ARCH="x86_64" PKG_ARCH="x86_64"
PKG_LICENSE="nonfree" PKG_LICENSE="nonfree"
PKG_SITE="https://www.nvidia.com/en-us/drivers/unix/" PKG_SITE="https://www.nvidia.com/en-us/drivers/unix/"

View File

@ -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 # 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. # changes to "packages/x11/driver/xf86-video-nvidia/udev.d/96-nvidia.rules" whenever bumping version.
# The build host may require installation of python3-lxml and python3-requests packages. # The build host may require installation of python3-lxml and python3-requests packages.
PKG_VERSION="470.129.06" PKG_VERSION="470.141.03"
PKG_SHA256="6ac030d692d45c065ad88d30fb7358834df9ceb4f37caaad459a4d7c64877ea7" PKG_SHA256="87056cfd6f9fb915946b01adbad01cdc6a13db2f1c00c21dce9367692b7ca42d"
PKG_ARCH="x86_64" PKG_ARCH="x86_64"
PKG_LICENSE="nonfree" PKG_LICENSE="nonfree"
PKG_SITE="https://www.nvidia.com/en-us/drivers/unix/" PKG_SITE="https://www.nvidia.com/en-us/drivers/unix/"

View File

@ -1,22 +0,0 @@
--- a/kernel/nvidia-drm/nvidia-dma-resv-helper.h 2022-05-12 22:42:02.000000000 +0000
+++ b/kernel/nvidia-drm/nvidia-dma-resv-helper.h 2022-06-29 08:19:44.859696269 +0000
@@ -23,6 +23,7 @@
#ifndef __NVIDIA_DMA_RESV_HELPER_H__
#define __NVIDIA_DMA_RESV_HELPER_H__
+#include <linux/version.h>
#include "nvidia-drm-conftest.h"
#if defined(NV_DRM_FENCE_AVAILABLE)
@@ -69,7 +70,11 @@
nv_dma_fence_t *fence)
{
#if defined(NV_LINUX_DMA_RESV_H_PRESENT)
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 19, 0))
+ dma_resv_add_fence(obj, fence, DMA_RESV_USAGE_WRITE);
+#else
dma_resv_add_excl_fence(obj, fence);
+#endif
#else
reservation_object_add_excl_fence(obj, fence);
#endif

View File

@ -369,6 +369,7 @@ ATTR{device}=="0x24fa", GOTO="configure_nvidia"
ATTR{device}=="0x2503", GOTO="configure_nvidia" ATTR{device}=="0x2503", GOTO="configure_nvidia"
ATTR{device}=="0x2504", GOTO="configure_nvidia" ATTR{device}=="0x2504", GOTO="configure_nvidia"
ATTR{device}=="0x2507", GOTO="configure_nvidia" ATTR{device}=="0x2507", GOTO="configure_nvidia"
ATTR{device}=="0x2508", GOTO="configure_nvidia"
ATTR{device}=="0x2520", GOTO="configure_nvidia" ATTR{device}=="0x2520", GOTO="configure_nvidia"
ATTR{device}=="0x2523", GOTO="configure_nvidia" ATTR{device}=="0x2523", GOTO="configure_nvidia"
ATTR{device}=="0x2531", GOTO="configure_nvidia" ATTR{device}=="0x2531", GOTO="configure_nvidia"