mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-24 11:16:51 +00:00
Merge pull request #7258 from SupervisedThinking/up_nvidia_x11
xf86-video-nvidia: update to 470.161.03
This commit is contained in:
CvH
GitHub
commit
104bbe8de8
@ -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.
|
||||
# The build host may require installation of python3-lxml and python3-requests packages.
|
||||
PKG_VERSION="470.141.03"
|
||||
PKG_SHA256="87056cfd6f9fb915946b01adbad01cdc6a13db2f1c00c21dce9367692b7ca42d"
|
||||
PKG_VERSION="470.161.03"
|
||||
PKG_SHA256="b318c15d519898fd60c64ef73fdd331045884a1d97d811a25fbced544b5be6ad"
|
||||
PKG_ARCH="x86_64"
|
||||
PKG_LICENSE="nonfree"
|
||||
PKG_SITE="https://www.nvidia.com/en-us/drivers/unix/"
|
||||
@ -38,43 +38,47 @@ make_target() {
|
||||
}
|
||||
|
||||
makeinstall_target() {
|
||||
# Linux kernel modules
|
||||
mkdir -p ${INSTALL}/usr/lib/nvidia
|
||||
cp -P kernel/nvidia.ko ${INSTALL}/usr/lib/nvidia
|
||||
mkdir -p ${INSTALL}/$(get_full_module_dir)/nvidia
|
||||
ln -sf /var/lib/nvidia.ko ${INSTALL}/$(get_full_module_dir)/nvidia/nvidia.ko
|
||||
cp -P kernel/nvidia-uvm.ko ${INSTALL}/$(get_full_module_dir)/nvidia
|
||||
cp -P kernel/nvidia-modeset.ko ${INSTALL}/$(get_full_module_dir)/nvidia
|
||||
|
||||
# X driver
|
||||
mkdir -p ${INSTALL}/${XORG_PATH_MODULES}/drivers
|
||||
cp -P nvidia_drv.so ${INSTALL}/${XORG_PATH_MODULES}/drivers/nvidia-main_drv.so
|
||||
ln -sf /var/lib/nvidia_drv.so ${INSTALL}/${XORG_PATH_MODULES}/drivers/nvidia_drv.so
|
||||
|
||||
# GLX extension module for X
|
||||
mkdir -p ${INSTALL}/${XORG_PATH_MODULES}/extensions
|
||||
# rename to avoid conflicts with X.Org-Server module libglx.so
|
||||
cp -P libglxserver_nvidia.so.${PKG_VERSION} ${INSTALL}/${XORG_PATH_MODULES}/extensions/libglx_nvidia.so
|
||||
|
||||
# Xorg config
|
||||
mkdir -p ${INSTALL}/etc/X11
|
||||
cp ${PKG_DIR}/config/*.conf ${INSTALL}/etc/X11
|
||||
|
||||
# GLX
|
||||
mkdir -p ${INSTALL}/usr/lib
|
||||
cp -P libnvidia-glcore.so.${PKG_VERSION} ${INSTALL}/usr/lib
|
||||
cp -P libnvidia-glsi.so.${PKG_VERSION} ${INSTALL}/usr/lib
|
||||
cp -P libnvidia-ml.so.${PKG_VERSION} ${INSTALL}/usr/lib
|
||||
ln -sf /var/lib/libnvidia-ml.so.1 ${INSTALL}/usr/lib/libnvidia-ml.so.1
|
||||
cp -P libnvidia-tls.so.${PKG_VERSION} ${INSTALL}/usr/lib
|
||||
cp -P libGLX_nvidia.so.${PKG_VERSION} ${INSTALL}/usr/lib/libGLX_nvidia.so.0
|
||||
|
||||
mkdir -p ${INSTALL}/$(get_full_module_dir)/nvidia
|
||||
ln -sf /var/lib/nvidia.ko ${INSTALL}/$(get_full_module_dir)/nvidia/nvidia.ko
|
||||
cp -P kernel/nvidia-uvm.ko ${INSTALL}/$(get_full_module_dir)/nvidia
|
||||
cp -P kernel/nvidia-modeset.ko ${INSTALL}/$(get_full_module_dir)/nvidia
|
||||
# GLVND
|
||||
mkdir -p ${INSTALL}/usr/share/glvnd/egl_vendor.d
|
||||
cp -p 10_nvidia.json ${INSTALL}/usr/share/glvnd/egl_vendor.d
|
||||
|
||||
mkdir -p ${INSTALL}/usr/lib/nvidia
|
||||
cp -P kernel/nvidia.ko ${INSTALL}/usr/lib/nvidia
|
||||
# OpenGL / EGL
|
||||
mkdir -p ${INSTALL}/usr/lib
|
||||
cp -p libEGL_nvidia.so.${PKG_VERSION} ${INSTALL}/usr/lib/
|
||||
ln -sf libEGL_nvidia.so.${PKG_VERSION} ${INSTALL}/usr/lib/libEGL_nvidia.so.0
|
||||
ln -sf libEGL_nvidia.so.0 ${INSTALL}/usr/lib/libEGL_nvidia.so
|
||||
|
||||
mkdir -p ${INSTALL}/usr/bin
|
||||
ln -s /var/lib/nvidia-smi ${INSTALL}/usr/bin/nvidia-smi
|
||||
cp nvidia-smi ${INSTALL}/usr/bin/nvidia-main-smi
|
||||
ln -s /var/lib/nvidia-xconfig ${INSTALL}/usr/bin/nvidia-xconfig
|
||||
cp nvidia-xconfig ${INSTALL}/usr/bin/nvidia-main-xconfig
|
||||
|
||||
mkdir -p ${INSTALL}/usr/lib/vdpau
|
||||
cp libvdpau_nvidia.so* ${INSTALL}/usr/lib/vdpau/libvdpau_nvidia-main.so.1
|
||||
ln -sf /var/lib/libvdpau_nvidia.so ${INSTALL}/usr/lib/vdpau/libvdpau_nvidia.so
|
||||
ln -sf /var/lib/libvdpau_nvidia.so.1 ${INSTALL}/usr/lib/vdpau/libvdpau_nvidia.so.1
|
||||
# OpenGL core
|
||||
mkdir -p ${INSTALL}/usr/lib
|
||||
cp -p libnvidia-eglcore.so.${PKG_VERSION} ${INSTALL}/usr/lib/
|
||||
cp -P libnvidia-glcore.so.${PKG_VERSION} ${INSTALL}/usr/lib
|
||||
cp -p libnvidia-glsi.so.${PKG_VERSION} ${INSTALL}/usr/lib
|
||||
|
||||
# Install Vulkan ICD & SPIR-V lib
|
||||
if [ "${VULKAN_SUPPORT}" = "yes" ]; then
|
||||
@ -85,4 +89,32 @@ makeinstall_target() {
|
||||
mkdir -p ${INSTALL}/usr/share/vulkan/implicit_layer.d
|
||||
cp -P nvidia_layers.json ${INSTALL}/usr/share/vulkan/icd.d
|
||||
fi
|
||||
|
||||
# nvidia-tls
|
||||
mkdir -p ${INSTALL}/usr/lib
|
||||
cp -P libnvidia-tls.so.${PKG_VERSION} ${INSTALL}/usr/lib
|
||||
|
||||
# NVIDIA Management Library (NVML) / System Management Interface
|
||||
mkdir -p ${INSTALL}/usr/bin
|
||||
ln -s /var/lib/nvidia-smi ${INSTALL}/usr/bin/nvidia-smi
|
||||
cp nvidia-smi ${INSTALL}/usr/bin/nvidia-main-smi
|
||||
|
||||
mkdir -p ${INSTALL}/usr/lib
|
||||
cp -P libnvidia-ml.so.${PKG_VERSION} ${INSTALL}/usr/lib
|
||||
ln -sf /var/lib/libnvidia-ml.so.1 ${INSTALL}/usr/lib/libnvidia-ml.so.1
|
||||
|
||||
# Tool for manipulating X server configuration files
|
||||
mkdir -p ${INSTALL}/usr/bin
|
||||
ln -s /var/lib/nvidia-xconfig ${INSTALL}/usr/bin/nvidia-xconfig
|
||||
cp nvidia-xconfig ${INSTALL}/usr/bin/nvidia-main-xconfig
|
||||
|
||||
# VDPAU
|
||||
mkdir -p ${INSTALL}/usr/lib/vdpau
|
||||
cp libvdpau_nvidia.so* ${INSTALL}/usr/lib/vdpau/libvdpau_nvidia-main.so.1
|
||||
ln -sf /var/lib/libvdpau_nvidia.so ${INSTALL}/usr/lib/vdpau/libvdpau_nvidia.so
|
||||
ln -sf /var/lib/libvdpau_nvidia.so.1 ${INSTALL}/usr/lib/vdpau/libvdpau_nvidia.so.1
|
||||
|
||||
# App profiles
|
||||
mkdir -p ${INSTALL}/usr/share/nvidia
|
||||
cp -P nvidia-application-profiles-${PKG_VERSION}-rc ${INSTALL}/usr/share/nvidia
|
||||
}
|
||||
|
||||
@ -1,60 +0,0 @@
|
||||
From 17bed78791d6f311c83ff1794d085b18c9f89730 Mon Sep 17 00:00:00 2001
|
||||
From: Joan Bruguera <joanbrugueram@gmail.com>
|
||||
Date: Wed, 3 Aug 2022 00:56:57 +0200
|
||||
Subject: [PATCH] Tentative fix for NVIDIA 470.141.03 driver for Linux 6.0-rc1
|
||||
|
||||
---
|
||||
kernel/nvidia-drm/nvidia-drm-helper.c | 5 +++++
|
||||
kernel/nvidia/nv-acpi.c | 5 ++++-
|
||||
kernel/nvidia/nv.c | 3 ++-
|
||||
3 files changed, 11 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/kernel/nvidia-drm/nvidia-drm-helper.c b/kernel/nvidia-drm/nvidia-drm-helper.c
|
||||
index 3831180..fa03d51 100644
|
||||
--- a/kernel/nvidia-drm/nvidia-drm-helper.c
|
||||
+++ b/kernel/nvidia-drm/nvidia-drm-helper.c
|
||||
@@ -41,6 +41,11 @@
|
||||
#include <drm/drm_atomic_uapi.h>
|
||||
#endif
|
||||
|
||||
+// Add header which is no longer indirectly referenced as of Linux 6.0-rc1
|
||||
+#if defined(NV_DRM_DRM_FRAMEBUFFER_H_PRESENT)
|
||||
+#include <drm/drm_framebuffer.h>
|
||||
+#endif
|
||||
+
|
||||
static void __nv_drm_framebuffer_put(struct drm_framebuffer *fb)
|
||||
{
|
||||
#if defined(NV_DRM_FRAMEBUFFER_GET_PRESENT)
|
||||
diff --git a/kernel/nvidia/nv-acpi.c b/nvidia/nv-acpi.c
|
||||
index 2b7b988..76c36fa 100644
|
||||
--- a/kernel/nvidia/nv-acpi.c
|
||||
+++ b/kernel/nvidia/nv-acpi.c
|
||||
@@ -16,7 +16,10 @@
|
||||
|
||||
#include <linux/acpi.h>
|
||||
|
||||
-#if defined(NV_LINUX_ACPI_EVENTS_SUPPORTED)
|
||||
+#include <linux/version.h>
|
||||
+// Rel.commit "ACPI: bus: Drop unused list heads from struct acpi_device" (Rafael J. Wysocki, 4 Jun 2022)
|
||||
+// Disable ACPI support due to more GPL stuff (acpi_dev_for_each_child is only GPL-exported)
|
||||
+#if defined(NV_LINUX_ACPI_EVENTS_SUPPORTED) && (LINUX_VERSION_CODE < KERNEL_VERSION(6, 0, 0))
|
||||
static NV_STATUS nv_acpi_extract_integer (const union acpi_object *, void *, NvU32, NvU32 *);
|
||||
static NV_STATUS nv_acpi_extract_buffer (const union acpi_object *, void *, NvU32, NvU32 *);
|
||||
static NV_STATUS nv_acpi_extract_package (const union acpi_object *, void *, NvU32, NvU32 *);
|
||||
diff --git a/kernel/nvidia/nv.c b/kernel/nvidia/nv.c
|
||||
index ab7d17c..e313e2e 100644
|
||||
--- a/kernel/nvidia/nv.c
|
||||
+++ b/kernel/nvidia/nv.c
|
||||
@@ -5423,7 +5423,8 @@ NvBool NV_API_CALL nv_s2idle_pm_configured(void)
|
||||
{
|
||||
NvU8 buf[8];
|
||||
|
||||
-#if defined(NV_SEQ_READ_ITER_PRESENT)
|
||||
+// FIXME: Avoid this code path because on Linux 6.0-rc1, init_sync_kiocb references a GPL symbol
|
||||
+#if defined(NV_SEQ_READ_ITER_PRESENT) && (LINUX_VERSION_CODE < KERNEL_VERSION(6, 0, 0))
|
||||
struct file *file;
|
||||
ssize_t num_read;
|
||||
struct kiocb kiocb;
|
||||
--
|
||||
2.37.1
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user