jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

nvidia390: update to 390.147.

Browse source
This commit is contained in:
Andrew Benson 2021-12-20 19:31:39 -06:00
parent e7c9f9ba8f
commit 2343a0618d
3 changed files with 5 additions and 87 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common/shlibs
View file

@ -136,7 +136,7 @@ libnvidia-gtk2.so.346.47 nvidia-gtklibs-346.47_1 ignore
libnvidia-gtk3.so.346.47 nvidia-gtklibs-346.47_1 ignore
libnvidia-glcore.so.390.87 nvidia390-libs-390.87_1 ignore
libnvidia-glsi.so.346.72 nvidia-libs-346.72_1 ignore
libnvidia-fatbinaryloader.so.390.144 nvidia390-libs-390.144_1 ignore
libnvidia-fatbinaryloader.so.390.147 nvidia390-libs-390.147_1 ignore
libnvidia-fatbinaryloader.so.430.40 nvidia-libs-430.40_1 ignore
libglapi.so.0 libglapi-7.11_1
libgbm.so.1 libgbm-9.0_1

77
srcpkgs/nvidia390/files/linux-5.14.patch
View file

@ -1,77 +0,0 @@
Taken from https://build.opensuse.org/package/view_file/X11:Drivers:Video/nvidia-gfxG04/kernel-5.14.patch?rev=233
Credit to Stefan Dirsch <sndirsch@suse.com>
--- a/VIDIA-Linux-x86_64-390.144-no-compat32/kernel/conftest.sh 2021-08-31 16:58:57.799629833 +0200
+++ b/NVIDIA-Linux-x86_64-390.144-no-compat32/kernel/conftest.sh 2021-08-31 18:00:09.257825534 +0200
@@ -4493,6 +4493,30 @@ compile_test() {
fi
;;
+ 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
}
--- a/NVIDIA-Linux-x86_64-390.144-no-compat32/kernel/nvidia/nvlink_linux.c 2021-08-31 16:58:57.787629590 +0200
+++ b/NVIDIA-Linux-x86_64-390.144-no-compat32/kernel/nvidia/nvlink_linux.c 2021-08-31 17:51:49.207744327 +0200
@@ -597,7 +597,7 @@ void NVLINK_API_CALL nvlink_sleep(unsign
// 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);
--- a/NVIDIA-Linux-x86_64-390.144-no-compat32/kernel/nvidia/os-interface.c 2021-08-31 16:58:57.787629590 +0200
+++ b/NVIDIA-Linux-x86_64-390.144-no-compat32/kernel/nvidia/os-interface.c 2021-08-31 17:51:58.043922420 +0200
@@ -580,7 +580,7 @@ NV_STATUS NV_API_CALL os_delay(NvU32 Mil
// 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);
--- a/NVIDIA-Linux-x86_64-390.144-no-compat32/kernel/nvidia-drm/nvidia-drm-drv.c 2021-08-31 16:58:57.783629508 +0200
+++ b/NVIDIA-Linux-x86_64-390.144-no-compat32/kernel/nvidia-drm/nvidia-drm-drv.c 2021-08-31 17:56:41.345633279 +0200
@@ -811,7 +811,9 @@ static void nv_drm_register_drm_device(c
dev->dev_private = nv_dev;
nv_dev->dev = dev;
+#if defined(NV_DRM_DEVICE_HAS_PDEV)
dev->pdev = pdev;
+#endif
/* Register DRM device to DRM sub-system */
--- a/NVIDIA-Linux-x86_64-390.144-no-compat32/kernel/nvidia-drm/nvidia-drm.Kbuild 2021-08-31 16:58:57.783629508 +0200
+++ b/NVIDIA-Linux-x86_64-390.144-no-compat32/kernel/nvidia-drm/nvidia-drm.Kbuild 2021-08-31 17:53:18.265539346 +0200
@@ -102,3 +102,4 @@ NV_CONFTEST_TYPE_COMPILE_TESTS += drm_dr
NV_CONFTEST_TYPE_COMPILE_TESTS += drm_crtc_atomic_check_has_atomic_state_arg
NV_CONFTEST_TYPE_COMPILE_TESTS += drm_gem_object_vmap_has_map_arg
NV_CONFTEST_TYPE_COMPILE_TESTS += drm_plane_atomic_check_has_atomic_state_arg
+NV_CONFTEST_TYPE_COMPILE_TESTS += drm_device_has_pdev

13
srcpkgs/nvidia390/template
View file

@ -3,8 +3,8 @@
_desc="NVIDIA drivers (GeForce 400, 500 series)"
pkgname=nvidia390
version=390.144
revision=2
version=390.147
revision=1
maintainer="Andrew Benson <abenson+void@gmail.com>"
license="custom:NVIDIA Proprietary"
homepage="https://www.nvidia.com"
@ -22,11 +22,11 @@ conflicts="xserver-abi-video>24_1"
if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
_pkg="NVIDIA-Linux-x86-${version}"
distfiles="http://uk.download.nvidia.com/XFree86/Linux-x86/${version}/${_pkg}.run"
checksum=fa586d11fcf103f81eda7d859a2a8ccdeb7371f4742fe942cb4a9b0aeb6bbb30
checksum=2ac4b05d0de612f13f5f080dff6c73f06ea8b1d8ea21b7505441027ab4d55b01
else
_pkg="NVIDIA-Linux-x86_64-${version}-no-compat32"
distfiles="http://uk.download.nvidia.com/XFree86/Linux-x86_64/${version}/${_pkg}.run"
checksum=d9b36e51253592d7aeecb9758ebccf30348ab364c88f95aa5ba33c767470949c
checksum=3fc4b5a7c64326cea79156fc31e8160a89621219df09a4cd268844c3e318accc
fi
subpackages="nvidia390-gtklibs nvidia390-dkms nvidia390-opencl nvidia390-libs"
@ -39,11 +39,6 @@ do_extract() {
cd ${_pkg}
}
do_patch() {
cd "${wrksrc}/${_pkg}"
patch -Np2 < $FILESDIR/linux-5.14.patch
}
pre_install() {
cd ${_pkg}
cp nvidia_icd.json.template nvidia_icd.json