diff --git a/kernel/drivers/module-nvidia465/actions.py b/kernel/drivers/module-nvidia465/actions.py deleted file mode 100644 index 28d1582d8f..0000000000 --- a/kernel/drivers/module-nvidia465/actions.py +++ /dev/null @@ -1,263 +0,0 @@ -# -*- coding: utf-8 -*- -# -# Licensed under the GNU General Public License, version 3. -# See the file http://www.gnu.org/licenses/gpl.txt - -from pisi.actionsapi import get -from pisi.actionsapi import autotools -from pisi.actionsapi import pisitools -from pisi.actionsapi import shelltools -from pisi.actionsapi import kerneltools - -WorkDir = "." -KDIR = kerneltools.getKernelVersion() -NoStrip = ["/lib/modules"] - -version = get.srcVERSION() -driver_dir_name = "nvidia465" -datadir = "/usr/share/%s" % driver_dir_name -libdir = "/usr/lib32" if get.buildTYPE() == 'emul32' else "/usr/lib" -arch = "x86" if get.buildTYPE() == 'emul32' else get.ARCH().replace("i6", "x") -nvlibdir = "%s/%s" % (libdir, driver_dir_name) -xorglibdir= "%s/xorg" % libdir - -def setup(): - shelltools.system("sh NVIDIA-Linux-x86_64-%s.run -x --target tmp" - % get.srcVERSION()) - shelltools.move("tmp/*", ".") - - #5.5 patch icin - shelltools.move("tmp/.manifest", ".") - - #shelltools.system("patch -p1 < NVIDIA-Linux-x86_64-430.64-work-around-mga-bug-25890.patch") - #shelltools.system("patch -p1 < NVIDIA-Linux-x86_64-430.64-kernel-5.5.patch") - #shelltools.system("patch -p1 < kernel-5.6.patch") - - - # Our libc is TLS enabled so use TLS library - #shelltools.unlink("*-tls.so*") - #shelltools.move("tls/*", ".") - - # xorg-server provides libwfb.so - #shelltools.unlink("libnvidia-wfb.so.*") - - shelltools.echo("ld.so.conf", nvlibdir) - shelltools.echo("XvMCConfig", "%s/libXvMCNVIDIA.so" % nvlibdir) - - # dkms - shelltools.copytree("kernel", "kernel-dkms") - shelltools.unlink("kernel-dkms/dkms.conf") - shelltools.move("dkms.conf", "kernel-dkms/") - pisitools.dosed("kernel-dkms/Makefile", "CC \?= cc", "CC = /usr/bin/cc") - pisitools.dosed("kernel-dkms/dkms.conf", "%VERSION%", version) - -def build(): - # We don't need kernel module for emul32 build - if get.buildTYPE() == 'emul32': - return - - shelltools.export("SYSSRC", "/lib/modules/%s/build" % KDIR) - shelltools.cd("kernel") - autotools.make("module") - - -def install(): - - if not get.buildTYPE() == 'emul32': - # Kernel driver - pisitools.insinto("/lib/modules/%s/extra" % KDIR, - "kernel/nvidia.ko") - - pisitools.insinto("/lib/modules/%s/extra" % KDIR, - "kernel/nvidia-drm.ko") - - pisitools.insinto("/lib/modules/%s/extra" % KDIR, - "kernel/nvidia-uvm.ko") - - pisitools.insinto("/lib/modules/%s/extra" % KDIR, - "kernel/nvidia-modeset.ko") - - # Command line tools and their man pages - pisitools.dobin("nvidia-smi") - pisitools.doman("nvidia-smi.1.gz") - pisitools.dobin("nvidia-debugdump") - #pisitools.dobin("nvidia-xconfig") - #pisitools.doman("nvidia-xconfig.1.gz") - pisitools.dobin("nvidia-bug-report.sh") - pisitools.dobin("nvidia-cuda-mps-server") - pisitools.dobin("nvidia-cuda-mps-control") - pisitools.doman("nvidia-cuda-mps-control.1.gz") - pisitools.dobin("nvidia-modprobe") - pisitools.doman("nvidia-modprobe.1.gz") - pisitools.dobin("nvidia-persistenced") - pisitools.doman("nvidia-persistenced.1.gz") - #pisitools.dobin("nvidia-settings") - #pisitools.doman("nvidia-settings.1.gz") - - # dkms - pisitools.insinto("/usr/src/nvidia-%s" % version, "kernel-dkms/*") - - ### Libraries - - # 32-bit libraries - if get.buildTYPE() == 'emul32': - pisitools.dolib("32/libGL.so.1.7.0", nvlibdir) -# pisitools.dosym("libGL.so.%s" % version, "%s/libGL.so.1.2.0" % nvlibdir) - pisitools.dosym("libGL.so.1.7.0", "%s/libGL.so.1" % nvlibdir) - pisitools.dosym("libGL.so.1.7.0", "%s/libGL.so" % nvlibdir) - - pisitools.dolib("32/libEGL.so.1.1.0", nvlibdir) - pisitools.dosym("libEGL.so.1.1.0", "%s/libEGL.so.1" % nvlibdir) - pisitools.dosym("32/libEGL.so.1.1.0", "%s/libEGL.so" % nvlibdir) - pisitools.dolib("32/libEGL_nvidia.so.%s" % version, libdir) - pisitools.dolib("32/libGLESv1_CM_nvidia.so.%s" % version, libdir) - pisitools.dolib("32/libGLESv2_nvidia.so.%s" % version, libdir) - - pisitools.insinto("/etc/OpenCL/vendors", "nvidia.icd") - pisitools.dolib("32/libnvidia-compiler.so.%s" % version, libdir) - pisitools.dosym("libnvidia-compiler.so.%s" % version, "%s/libnvidia-compiler.so.1" % libdir) - pisitools.dosym("libnvidia-compiler.so.%s" % version, "%s/libnvidia-compiler.so" % libdir) - - #pisitools.dolib("32/libOpenCL.so.1.0.0", libdir) - #pisitools.dosym("libOpenCL.so.1.0.0", "%s/libOpenCL.so.1.0" % libdir) - #pisitools.dosym("libOpenCL.so.1.0", "%s/libOpenCL.so.1" % libdir) - #pisitools.dosym("libOpenCL.so.1.0", "%s/libOpenCL.so" % libdir) - - pisitools.dolib("32/libnvidia-opencl.so.%s" % version, libdir) - pisitools.dosym("libnvidia-opencl.so.%s" % version, "%s/libnvidia-opencl.so.1" % libdir) - pisitools.dosym("libnvidia-opencl.so.1", "%s/libnvidia-opencl.so" % libdir) - - pisitools.dolib("32/libcuda.so.%s" % version, libdir) - pisitools.dosym("libcuda.so.%s" % version, "%s/libcuda.so.1" % libdir) - pisitools.dosym("libcuda.so.1", "%s/libcuda.so" % libdir) - - pisitools.dolib("32/libnvcuvid.so.%s" % version, libdir) - pisitools.dosym("libnvcuvid.so.%s" % version, "%s/libnvcuvid.so.1" % libdir) - pisitools.dosym("libnvcuvid.so.1", "%s/libnvcuvid.so" % libdir) - - pisitools.dolib("32/libnvidia-ml.so.%s" % version, libdir) - pisitools.dosym("libnvidia-ml.so.%s" % version, "%s/libnvidia-ml.so.1" % libdir) - - for lib in ("eglcore", "encode", "allocator", "fbc", "glcore", "glsi", \ - "glvkspirv", "ifr", "opticalflow", "ptxjitcompiler", "tls" ): - pisitools.dolib("32/libnvidia-%s.so.%s" % (lib, version), libdir) - pisitools.dosym("libnvidia-%s.so.%s" % (lib, version), "%s/libnvidia-%s.so.1" %(libdir, lib)) - pisitools.dosym("libnvidia-%s.so.%s" % (lib, version), "%s/libnvidia-%s.so" %(libdir, lib)) - - pisitools.dolib("32/libvdpau_nvidia.so.%s" % version, "%s/vdpau" % libdir) - pisitools.dosym("libvdpau_nvidia.so.%s" % version, "%s/libvdpau_nvidia.so" % libdir) - - - pisitools.dolib("32/libGLX_nvidia.so.%s" % version, libdir) - pisitools.dosym("libGLX_nvidia.so.%s" % version, "%s/libGLX_indirect.so.0" % libdir) - pisitools.dosym("libGLX_nvidia.so.%s" % version, "%s/libGLX_indirect.so" % libdir) - - else: - # OpenGl library - pisitools.dolib("libGL.so.1.7.0", nvlibdir) -# pisitools.dosym("libGL.so.%s" % version, "%s/libGL.so.1.2.0" % nvlibdir) - pisitools.dosym("libGL.so.1.7.0", "%s/libGL.so.1" % nvlibdir) - pisitools.dosym("libGL.so.1.7.0", "%s/libGL.so" % nvlibdir) - - pisitools.dolib("libEGL.so.1.1.0", nvlibdir) - pisitools.dosym("libEGL.so.1.1.0", "%s/libEGL.so.1" % nvlibdir) - pisitools.dosym("libEGL.so.1.1.0", "%s/libEGL.so" % nvlibdir) - pisitools.dolib("libEGL_nvidia.so.%s" % version, libdir) - pisitools.dolib("libGLESv1_CM_nvidia.so.%s" % version, libdir) - pisitools.dolib("libGLESv2_nvidia.so.%s" % version, libdir) - - pisitools.dolib("libGLdispatch.so.0", libdir) - pisitools.dosym("libGLdispatch.so.0", "%s/libGLdispatch.so" % libdir) - - # OpenCL - pisitools.insinto("/etc/OpenCL/vendors", "nvidia.icd") - pisitools.dolib("libnvidia-compiler.so.%s" % version, libdir) - pisitools.dosym("libnvidia-compiler.so.%s" % version, "%s/libnvidia-compiler.so.1" % libdir) - pisitools.dosym("libnvidia-compiler.so.%s" % version, "%s/libnvidia-compiler.so" % libdir) - - #pisitools.dolib("libOpenCL.so.1.0.0", libdir) - #pisitools.dosym("libOpenCL.so.1.0.0", "%s/libOpenCL.so.1.0" % libdir) - #pisitools.dosym("libOpenCL.so.1.0", "%s/libOpenCL.so.1" % libdir) - #pisitools.dosym("libOpenCL.so.1.0", "%s/libOpenCL.so" % libdir) - - pisitools.dolib("libnvidia-opencl.so.%s" % version, libdir) - pisitools.dosym("libnvidia-opencl.so.%s" % version, "%s/libnvidia-opencl.so.1" % libdir) - pisitools.dosym("libnvidia-opencl.so.1", "%s/libnvidia-opencl.so" % libdir) - - # CUDA - pisitools.dolib("libcuda.so.%s" % version, libdir) - pisitools.dosym("libcuda.so.%s" % version, "%s/libcuda.so.1" % libdir) - pisitools.dosym("libcuda.so.1", "%s/libcuda.so" % libdir) - - pisitools.dolib("libnvcuvid.so.%s" % version, libdir) - pisitools.dosym("libnvcuvid.so.%s" % version, "%s/libnvcuvid.so.1" % libdir) - pisitools.dosym("libnvcuvid.so.1", "%s/libnvcuvid.so" % libdir) - - # NVML - # Provides programmatic access to static information and monitoring - # data for NVIDIA GPUs, as well as limited managment capabilities - pisitools.dolib("libnvidia-ml.so.%s" % version, libdir) - pisitools.dosym("libnvidia-ml.so.%s" % version, "%s/libnvidia-ml.so.1" % libdir) - - pisitools.dolib("libnvidia-cfg.so.%s" % version, libdir) - pisitools.dosym("libnvidia-cfg.so.%s" % version, "%s/libnvidia-cfg.so.1" % libdir) - - pisitools.dolib("libnvoptix.so.%s" % version, libdir) - pisitools.dosym("libnvoptix.so.%s" % version, "%s/libnvoptix.so.1" % libdir) - pisitools.dosym("libnvoptix.so.%s" % version, "%s/libnvoptix.so" % libdir) - - pisitools.dolib("libnvidia-egl-wayland.so.1.1.5", libdir) - pisitools.dosym("libnvidia-egl-wayland.so.1.1.5", "%s/libnvidia-egl-wayland.so.1" % libdir) - pisitools.dosym("libnvidia-egl-wayland.so.1.1.5", "%s/libnvidia-egl-wayland.so" % libdir) - - # OpenGL core library and others - for lib in ("cbl", "eglcore", "encode", "allocator", "fbc", "glcore", "glsi", \ - "glvkspirv", "ifr", "ngx", "opticalflow", "ptxjitcompiler", "rtcore", "tls" ): - pisitools.dolib("libnvidia-%s.so.%s" % (lib, version), libdir) - pisitools.dosym("libnvidia-%s.so.%s" % (lib, version), "%s/libnvidia-%s.so.1" %(libdir, lib)) - pisitools.dosym("libnvidia-%s.so.%s" % (lib, version), "%s/libnvidia-%s.so" %(libdir, lib)) - - # VDPAU driver - pisitools.dolib("libvdpau_nvidia.so.%s" % version, "%s/vdpau" % libdir) - pisitools.dosym("libvdpau_nvidia.so.%s" % version, "%s/libvdpau_nvidia.so" % libdir) - - # X modules - pisitools.dolib("nvidia_drv.so", "%s/modules/drivers" % xorglibdir) - pisitools.dolib("libglxserver_nvidia.so.%s" % version, "%s" % nvlibdir) - pisitools.dosym("libglxserver_nvidia.so.%s" % version, "%s/libglx.so.1" % nvlibdir) - pisitools.dosym("libglxserver_nvidia.so.%s" % version, "%s/libglx.so" % nvlibdir) - pisitools.dolib("libglxserver_nvidia.so.%s" % version, "%s/modules/extensions" % xorglibdir) - pisitools.dosym("libglxserver_nvidia.so.%s" % version, "%s/modules/extensions/libglx.so.1" % xorglibdir) - pisitools.dolib("libGLX_nvidia.so.%s" % version, libdir) - pisitools.dosym("libGLX_nvidia.so.%s" % version, "%s/libGLX_indirect.so.0" % libdir) - pisitools.dosym("libGLX_nvidia.so.%s" % version, "%s/libGLX_indirect.so" % libdir) - - pisitools.insinto("/usr/share/X11/xorg.conf.d", "nvidia-drm-outputclass.conf") - # pisitools.insinto("/usr/share/nvidia", "nvidia-application-profiles-367.27-rc") - # pisitools.insinto("/usr/share/nvidia", "nvidia-application-profiles-367.27-key-documentation") - #pisitools.insinto("/usr/share/pixmaps", "nvidia-settings.png") - - #pisitools.dolib("libnvidia-gtk2.so.%s" % version, libdir) - #pisitools.dolib("libnvidia-gtk3.so.%s" % version, libdir) - - - - - # Exit time for emul32 build - #if get.buildTYPE() == 'emul32': - #pisitools.insinto(datadir, "ld.so.conf", "32bit-ld.so.conf") - #return - - pisitools.insinto(datadir, "ld.so.conf") - pisitools.insinto(datadir, "XvMCConfig") - - # Documentation - docdir = "xorg-video-%s" % driver_dir_name - pisitools.dodoc("LICENSE", "NVIDIA_Changelog", "README.txt", destDir=docdir) - pisitools.dohtml("html/*", destDir=docdir) - - ### Note - # This package includes nvidia-setting and nvidia-xconfig binaries. However - # we have seperate packages for each of them. Nvidia provides tarballs for - # these binaries. Don't forget to update these package with each NVIDIA - # driver update. diff --git a/kernel/drivers/module-nvidia465/comar/package.py b/kernel/drivers/module-nvidia465/comar/package.py deleted file mode 100644 index 299bbe6f89..0000000000 --- a/kernel/drivers/module-nvidia465/comar/package.py +++ /dev/null @@ -1,32 +0,0 @@ -#!/usr/bin/python - -import os - -def postInstall(fromVersion, fromRelease, toVersion, toRelease): - if os.path.exists("/etc/default/grub"): - fileContent = open("/etc/default/grub").readlines() - new = [] - for line in fileContent: - line = line.strip() - if line.startswith("#GRUB_CMDLINE_LINUX="): line = line[1:] - if line.startswith("GRUB_CMDLINE_LINUX="): - if not "rd.driver.blacklist=nouveau" in line: - if not line[-2] == '"': line = "%s \"" % line[:-1] - line = "%srd.driver.blacklist=nouveau\"" % line[:-1] - new.append(line) - with open("/etc/default/grub", "w") as f: f.write("\n".join(new)) - os.system("grub2-mkconfig -o /boot/grub2/grub.cfg") - -def postRemove(): - if os.path.exists("/etc/default/grub"): - fileContent = open("/etc/default/grub").readlines() - new = [] - for line in fileContent: - line = line.strip() - if line.startswith("GRUB_CMDLINE_LINUX="): - if not "rd.driver.blacklist=nouveau" in line: return - line = "%s\"" % line[:-1-len("rd.driver.blacklist=nouveau")] - if line[-2] == " ": line = "%s\"" % line[:-2] - new.append(line) - with open("/etc/default/grub", "w") as f: f.write("\n".join(new)) - os.system("grub2-mkconfig -o /boot/grub2/grub.cfg") diff --git a/kernel/drivers/module-nvidia465/files/dkms.conf b/kernel/drivers/module-nvidia465/files/dkms.conf deleted file mode 100644 index b6f93eb7bb..0000000000 --- a/kernel/drivers/module-nvidia465/files/dkms.conf +++ /dev/null @@ -1,19 +0,0 @@ -PACKAGE_NAME="nvidia" -PACKAGE_VERSION="%VERSION%" -AUTOINSTALL="yes" - -# By default, DKMS will add KERNELRELEASE to the make command line; however, -# this will cause the kernel module build to infer that it was invoked via -# Kbuild directly instead of DKMS. The dkms(8) manual page recommends quoting -# the 'make' command name to suppress this behavior. -MAKE[0]="'make' -j5 NV_EXCLUDE_BUILD_MODULES='' KERNEL_UNAME=${kernelver} modules" - -# The list of kernel modules was generated by nvidia-installer at runtime. -BUILT_MODULE_NAME[0]="nvidia" -DEST_MODULE_LOCATION[0]="/extra" -BUILT_MODULE_NAME[1]="nvidia-uvm" -DEST_MODULE_LOCATION[1]="/extra" -BUILT_MODULE_NAME[2]="nvidia-modeset" -DEST_MODULE_LOCATION[2]="/extra" -BUILT_MODULE_NAME[3]="nvidia-drm" -DEST_MODULE_LOCATION[3]="/extra" diff --git a/kernel/drivers/module-nvidia465/files/mageia/NVIDIA-Linux-x86_64-430.64-kernel-5.5.patch b/kernel/drivers/module-nvidia465/files/mageia/NVIDIA-Linux-x86_64-430.64-kernel-5.5.patch deleted file mode 100644 index 109fd40006..0000000000 --- a/kernel/drivers/module-nvidia465/files/mageia/NVIDIA-Linux-x86_64-430.64-kernel-5.5.patch +++ /dev/null @@ -1,386 +0,0 @@ - - .manifest | 1 + - kernel/common/inc/nv-drm.h | 36 ++++++++++++++++++++++++++++++++++++ - kernel/conftest.sh | 31 +++++++++++++++++++++++++++++++ - kernel/nvidia-drm/nvidia-drm-connector.c | 14 ++++++++++++++ - kernel/nvidia-drm/nvidia-drm-connector.h | 2 +- - kernel/nvidia-drm/nvidia-drm-crtc.h | 2 +- - kernel/nvidia-drm/nvidia-drm-drv.c | 2 +- - kernel/nvidia-drm/nvidia-drm-encoder.h | 2 +- - kernel/nvidia-drm/nvidia-drm-fb.h | 2 +- - kernel/nvidia-drm/nvidia-drm-gem.h | 2 +- - kernel/nvidia-drm/nvidia-drm-helper.c | 2 +- - kernel/nvidia-drm/nvidia-drm-helper.h | 2 +- - kernel/nvidia-drm/nvidia-drm-modeset.h | 2 +- - kernel/nvidia-drm/nvidia-drm-os-interface.h | 2 +- - kernel/nvidia-drm/nvidia-drm-prime-fence.h | 2 +- - kernel/nvidia-drm/nvidia-drm-priv.h | 2 +- - kernel/nvidia-drm/nvidia-drm-utils.h | 2 +- - 17 files changed, 95 insertions(+), 13 deletions(-) - -diff -Nurp a/kernel/common/inc/nv-drm.h b/kernel/common/inc/nv-drm.h ---- a/kernel/common/inc/nv-drm.h 1970-01-01 02:00:00.000000000 +0200 -+++ b/kernel/common/inc/nv-drm.h 2020-02-09 23:07:31.142465482 +0200 -@@ -0,0 +1,36 @@ -+#ifndef _NV_DRM_H_ -+#define _NV_DRM_H_ -+ -+#include "conftest.h" -+ -+#if defined(NV_DRM_DRMP_H_PRESENT) -+#include -+#else -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+ -+#include -+#include -+ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+ -+#include -+#endif -+ -+#endif -diff -Nurp a/kernel/conftest.sh b/kernel/conftest.sh ---- a/kernel/conftest.sh 2019-10-23 18:48:14.000000000 +0300 -+++ b/kernel/conftest.sh 2020-02-09 23:07:31.143465528 +0200 -@@ -1080,6 +1080,9 @@ compile_test() { - CODE=" - #if defined(NV_DRM_DRMP_H_PRESENT) - #include -+ #else -+ #include -+ #include - #endif - #if !defined(CONFIG_DRM) && !defined(CONFIG_DRM_MODULE) - #error DRM not enabled -@@ -1769,6 +1772,8 @@ compile_test() { - echo "$CONFTEST_PREAMBLE - #if defined(NV_DRM_DRMP_H_PRESENT) - #include -+ #else -+ #include - #endif - #include - #if !defined(CONFIG_DRM) && !defined(CONFIG_DRM_MODULE) -@@ -1897,7 +1902,11 @@ compile_test() { - # attached drivers") in v3.14 (2013-12-11) - # - CODE=" -+ #if defined(NV_DRM_DRMP_H_PRESENT) - #include -+ #else -+ #include -+ #endif - int conftest_drm_driver_has_legacy_dev_list(void) { - return offsetof(struct drm_driver, legacy_dev_list); - }" -@@ -1921,7 +1930,11 @@ compile_test() { - # 2017-07-23 e6fc3b68558e4c6d8d160b5daf2511b99afa8814 - # - CODE=" -+ #if defined(NV_DRM_DRMP_H_PRESENT) - #include -+ #else -+ #include -+ #endif - - int conftest_drm_crtc_init_with_planes_has_name_arg(void) { - return -@@ -1937,7 +1950,11 @@ compile_test() { - compile_check_conftest "$CODE" "NV_DRM_CRTC_INIT_WITH_PLANES_HAS_NAME_ARG" "" "types" - - CODE=" -+ #if defined(NV_DRM_DRMP_H_PRESENT) - #include -+ #else -+ #include -+ #endif - - int conftest_drm_encoder_init_has_name_arg(void) { - return -@@ -1952,7 +1969,11 @@ compile_test() { - compile_check_conftest "$CODE" "NV_DRM_ENCODER_INIT_HAS_NAME_ARG" "" "types" - - echo "$CONFTEST_PREAMBLE -+ #if defined(NV_DRM_DRMP_H_PRESENT) - #include -+ #else -+ #include -+ #endif - - int conftest_drm_universal_plane_init_has_format_modifiers_arg(void) { - return -@@ -1979,7 +2000,11 @@ compile_test() { - echo "#undef NV_DRM_UNIVERSAL_PLANE_INIT_HAS_FORMAT_MODIFIERS_ARG" | append_conftest "types" - - echo "$CONFTEST_PREAMBLE -+ #if defined(NV_DRM_DRMP_H_PRESENT) - #include -+ #else -+ #include -+ #endif - - int conftest_drm_universal_plane_init_has_name_arg(void) { - return -@@ -3119,7 +3144,9 @@ compile_test() { - # Introduce drm_framebuffer_{get,put}()) on 2017-02-28. - # - CODE=" -+ #if defined(NV_DRM_DRMP_H_PRESENT) - #include -+ #endif - #if defined(NV_DRM_DRM_FRAMEBUFFER_H_PRESENT) - #include - #endif -@@ -3138,7 +3165,9 @@ compile_test() { - # Introduce drm_gem_object_{get,put}()) on 2017-02-28. - # - CODE=" -+ #if defined(NV_DRM_DRMP_H_PRESENT) - #include -+ #endif - #if defined(NV_DRM_DRM_GEM_H_PRESENT) - #include - #endif -@@ -3157,7 +3186,9 @@ compile_test() { - # introduce drm_dev_{get/put} functions) on 2017-09-26. - # - CODE=" -+ #if defined(NV_DRM_DRMP_H_PRESENT) - #include -+ #endif - #if defined(NV_DRM_DRM_DRV_H_PRESENT) - #include - #endif -diff -Nurp a/kernel/nvidia-drm/nvidia-drm-connector.c b/kernel/nvidia-drm/nvidia-drm-connector.c ---- a/kernel/nvidia-drm/nvidia-drm-connector.c 2019-10-27 13:48:11.000000000 +0200 -+++ b/kernel/nvidia-drm/nvidia-drm-connector.c 2020-02-09 23:07:31.143465528 +0200 -@@ -20,6 +20,8 @@ - * DEALINGS IN THE SOFTWARE. - */ - -+#include -+ - #include "nvidia-drm-conftest.h" /* NV_DRM_ATOMIC_MODESET_AVAILABLE */ - - #if defined(NV_DRM_ATOMIC_MODESET_AVAILABLE) -@@ -71,7 +73,11 @@ static enum drm_connector_status __nv_dr - struct nv_drm_encoder *nv_detected_encoder = NULL; - - struct NvKmsKapiDynamicDisplayParams *pDetectParams = NULL; -+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 5, 0) - unsigned int i; -+#else -+ struct drm_encoder *encoder = NULL; -+#endif - - BUG_ON(!mutex_is_locked(&dev->mode_config.mutex)); - -@@ -87,11 +93,16 @@ static enum drm_connector_status __nv_dr - goto done; - } - -+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 5, 0) - for (i = 0; - i < DRM_CONNECTOR_MAX_ENCODER && detected_encoder == NULL; i++) { - struct drm_encoder *encoder; -+#else -+ drm_connector_for_each_possible_encoder(connector, encoder) { -+#endif - struct nv_drm_encoder *nv_encoder; - -+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 5, 0) - if (connector->encoder_ids[i] == 0) { - break; - } -@@ -102,6 +113,7 @@ static enum drm_connector_status __nv_dr - BUG_ON(encoder != NULL); - continue; - } -+#endif - - /* - * DVI-I connectors can drive both digital and analog -@@ -169,6 +181,8 @@ static enum drm_connector_status __nv_dr - } - - detected_encoder = encoder; -+ -+ break; - } - } - -diff -Nurp a/kernel/nvidia-drm/nvidia-drm-connector.h b/kernel/nvidia-drm/nvidia-drm-connector.h ---- a/kernel/nvidia-drm/nvidia-drm-connector.h 2019-10-27 13:48:11.000000000 +0200 -+++ b/kernel/nvidia-drm/nvidia-drm-connector.h 2020-02-09 23:07:31.143465528 +0200 -@@ -27,7 +27,7 @@ - - #if defined(NV_DRM_ATOMIC_MODESET_AVAILABLE) - --#include -+#include "nv-drm.h" - - #include "nvtypes.h" - #include "nvkms-api-types.h" -diff -Nurp a/kernel/nvidia-drm/nvidia-drm-crtc.h b/kernel/nvidia-drm/nvidia-drm-crtc.h ---- a/kernel/nvidia-drm/nvidia-drm-crtc.h 2019-10-27 13:48:11.000000000 +0200 -+++ b/kernel/nvidia-drm/nvidia-drm-crtc.h 2020-02-09 23:07:31.143465528 +0200 -@@ -29,7 +29,7 @@ - - #include "nvidia-drm-helper.h" - --#include -+#include "nv-drm.h" - #include "nvtypes.h" - #include "nvkms-kapi.h" - -diff -Nurp a/kernel/nvidia-drm/nvidia-drm-drv.c b/kernel/nvidia-drm/nvidia-drm-drv.c ---- a/kernel/nvidia-drm/nvidia-drm-drv.c 2019-10-27 13:48:11.000000000 +0200 -+++ b/kernel/nvidia-drm/nvidia-drm-drv.c 2020-02-09 23:07:31.143465528 +0200 -@@ -39,7 +39,7 @@ - - #include "nvidia-drm-ioctl.h" - --#include -+#include "nv-drm.h" - - /* - * Commit fcd70cd36b9b ("drm: Split out drm_probe_helper.h") -diff -Nurp a/kernel/nvidia-drm/nvidia-drm-encoder.h b/kernel/nvidia-drm/nvidia-drm-encoder.h ---- a/kernel/nvidia-drm/nvidia-drm-encoder.h 2019-10-27 13:48:11.000000000 +0200 -+++ b/kernel/nvidia-drm/nvidia-drm-encoder.h 2020-02-09 23:07:31.143465528 +0200 -@@ -32,7 +32,7 @@ - #if defined(NV_DRM_DRM_ENCODER_H_PRESENT) - #include - #else --#include -+#include "nv-drm.h" - #endif - - #include "nvkms-kapi.h" -diff -Nurp a/kernel/nvidia-drm/nvidia-drm-fb.h b/kernel/nvidia-drm/nvidia-drm-fb.h ---- a/kernel/nvidia-drm/nvidia-drm-fb.h 2019-10-27 13:48:11.000000000 +0200 -+++ b/kernel/nvidia-drm/nvidia-drm-fb.h 2020-02-09 23:07:31.143465528 +0200 -@@ -27,7 +27,7 @@ - - #if defined(NV_DRM_ATOMIC_MODESET_AVAILABLE) - --#include -+#include "nv-drm.h" - #include "nvidia-drm-gem-nvkms-memory.h" - #include "nvkms-kapi.h" - -diff -Nurp a/kernel/nvidia-drm/nvidia-drm-gem.h b/kernel/nvidia-drm/nvidia-drm-gem.h ---- a/kernel/nvidia-drm/nvidia-drm-gem.h 2019-10-27 13:48:11.000000000 +0200 -+++ b/kernel/nvidia-drm/nvidia-drm-gem.h 2020-02-09 23:07:31.143465528 +0200 -@@ -29,7 +29,7 @@ - - #include "nvidia-drm-priv.h" - --#include -+#include "nv-drm.h" - #include "nvkms-kapi.h" - - #if defined(NV_DRM_DRIVER_HAS_GEM_PRIME_RES_OBJ) -diff -Nurp a/kernel/nvidia-drm/nvidia-drm-helper.c b/kernel/nvidia-drm/nvidia-drm-helper.c ---- a/kernel/nvidia-drm/nvidia-drm-helper.c 2019-10-27 13:48:11.000000000 +0200 -+++ b/kernel/nvidia-drm/nvidia-drm-helper.c 2020-02-09 23:07:31.143465528 +0200 -@@ -31,7 +31,7 @@ - - #if defined(NV_DRM_ATOMIC_MODESET_AVAILABLE) - --#include -+#include "nv-drm.h" - #if defined(NV_DRM_DRM_ATOMIC_UAPI_H_PRESENT) - #include - #endif -diff -Nurp a/kernel/nvidia-drm/nvidia-drm-helper.h b/kernel/nvidia-drm/nvidia-drm-helper.h ---- a/kernel/nvidia-drm/nvidia-drm-helper.h 2019-10-27 13:48:11.000000000 +0200 -+++ b/kernel/nvidia-drm/nvidia-drm-helper.h 2020-02-09 23:07:31.143465528 +0200 -@@ -27,7 +27,7 @@ - - #if defined(NV_DRM_AVAILABLE) - --#include -+#include "nv-drm.h" - - /* - * drm_dev_put() is added by commit 9a96f55034e41b4e002b767e9218d55f03bdff7d -diff -Nurp a/kernel/nvidia-drm/nvidia-drm-modeset.h b/kernel/nvidia-drm/nvidia-drm-modeset.h ---- a/kernel/nvidia-drm/nvidia-drm-modeset.h 2019-10-27 13:48:11.000000000 +0200 -+++ b/kernel/nvidia-drm/nvidia-drm-modeset.h 2020-02-09 23:07:31.143465528 +0200 -@@ -27,7 +27,7 @@ - - #if defined(NV_DRM_ATOMIC_MODESET_AVAILABLE) - --#include -+#include "nv-drm.h" - - struct drm_atomic_state *nv_drm_atomic_state_alloc(struct drm_device *dev); - void nv_drm_atomic_state_clear(struct drm_atomic_state *state); -diff -Nurp a/kernel/nvidia-drm/nvidia-drm-os-interface.h b/kernel/nvidia-drm/nvidia-drm-os-interface.h ---- a/kernel/nvidia-drm/nvidia-drm-os-interface.h 2019-10-27 13:48:11.000000000 +0200 -+++ b/kernel/nvidia-drm/nvidia-drm-os-interface.h 2020-02-09 23:07:31.143465528 +0200 -@@ -29,7 +29,7 @@ - - #if defined(NV_DRM_AVAILABLE) - --#include -+#include "nv-drm.h" - - /* Set to true when the atomic modeset feature is enabled. */ - extern bool nv_drm_modeset_module_param; -diff -Nurp a/kernel/nvidia-drm/nvidia-drm-prime-fence.h b/kernel/nvidia-drm/nvidia-drm-prime-fence.h ---- a/kernel/nvidia-drm/nvidia-drm-prime-fence.h 2019-10-27 13:48:11.000000000 +0200 -+++ b/kernel/nvidia-drm/nvidia-drm-prime-fence.h 2020-02-09 23:07:31.143465528 +0200 -@@ -27,7 +27,7 @@ - - #if defined(NV_DRM_AVAILABLE) - --#include -+#include "nv-drm.h" - - #if defined(NV_DRM_DRIVER_HAS_GEM_PRIME_RES_OBJ) - -diff -Nurp a/kernel/nvidia-drm/nvidia-drm-priv.h b/kernel/nvidia-drm/nvidia-drm-priv.h ---- a/kernel/nvidia-drm/nvidia-drm-priv.h 2019-10-27 13:48:11.000000000 +0200 -+++ b/kernel/nvidia-drm/nvidia-drm-priv.h 2020-02-09 23:07:31.143465528 +0200 -@@ -27,7 +27,7 @@ - - #if defined(NV_DRM_AVAILABLE) - --#include -+#include "nv-drm.h" - - #if defined(NV_DRM_DRM_GEM_H_PRESENT) - #include -diff -Nurp a/kernel/nvidia-drm/nvidia-drm-utils.h b/kernel/nvidia-drm/nvidia-drm-utils.h ---- a/kernel/nvidia-drm/nvidia-drm-utils.h 2019-10-27 13:48:11.000000000 +0200 -+++ b/kernel/nvidia-drm/nvidia-drm-utils.h 2020-02-09 23:07:31.143465528 +0200 -@@ -27,7 +27,7 @@ - - #if defined(NV_DRM_ATOMIC_MODESET_AVAILABLE) - --#include -+#include "nv-drm.h" - #include "nvkms-kapi.h" - - struct NvKmsKapiConnectorInfo* \ No newline at end of file diff --git a/kernel/drivers/module-nvidia465/files/mageia/NVIDIA-Linux-x86_64-430.64-kernel-5.6.patch b/kernel/drivers/module-nvidia465/files/mageia/NVIDIA-Linux-x86_64-430.64-kernel-5.6.patch deleted file mode 100644 index 1963c03ad9..0000000000 --- a/kernel/drivers/module-nvidia465/files/mageia/NVIDIA-Linux-x86_64-430.64-kernel-5.6.patch +++ /dev/null @@ -1,508 +0,0 @@ -diff -Nurp NVIDIA-Linux-x86_64-430.64.orig/kernel/common/inc/nv-linux.h NVIDIA-Linux-x86_64-430.64/kernel/common/inc/nv-linux.h ---- NVIDIA-Linux-x86_64-430.64.orig/kernel/common/inc/nv-linux.h 2019-10-27 13:48:11.000000000 +0200 -+++ NVIDIA-Linux-x86_64-430.64/kernel/common/inc/nv-linux.h 2020-04-11 01:30:24.576641371 +0300 -@@ -534,7 +534,11 @@ static inline void *nv_ioremap(NvU64 phy - - static inline void *nv_ioremap_nocache(NvU64 phys, NvU64 size) - { -+#if defined(NV_IOREMAP_NOCACHE_PRESENT) - void *ptr = ioremap_nocache(phys, size); -+#else -+ void *ptr = ioremap(phys, size); -+#endif - if (ptr) - NV_MEMDBG_ADD(ptr, size); - return ptr; -diff -Nurp NVIDIA-Linux-x86_64-430.64.orig/kernel/common/inc/nv-procfs.h NVIDIA-Linux-x86_64-430.64/kernel/common/inc/nv-procfs.h ---- NVIDIA-Linux-x86_64-430.64.orig/kernel/common/inc/nv-procfs.h 2020-04-11 01:29:29.475036592 +0300 -+++ NVIDIA-Linux-x86_64-430.64/kernel/common/inc/nv-procfs.h 2020-04-11 01:28:48.300091052 +0300 -@@ -28,6 +28,18 @@ - - #define IS_EXERCISE_ERROR_FORWARDING_ENABLED() (EXERCISE_ERROR_FORWARDING) - -+#if defined(NV_HAVE_PROC_OPS) -+#define NV_CREATE_PROC_FILE(filename,parent,__name,__data) \ -+ ({ \ -+ struct proc_dir_entry *__entry; \ -+ int mode = (S_IFREG | S_IRUGO); \ -+ const struct proc_ops *fops = &nv_procfs_##__name##_fops; \ -+ if (fops->proc_write != 0) \ -+ mode |= S_IWUSR; \ -+ __entry = proc_create_data(filename, mode, parent, fops, __data);\ -+ __entry; \ -+ }) -+#else - #define NV_CREATE_PROC_FILE(filename,parent,__name,__data) \ - ({ \ - struct proc_dir_entry *__entry; \ -@@ -38,6 +50,7 @@ - __entry = proc_create_data(filename, mode, parent, fops, __data);\ - __entry; \ - }) -+#endif - - /* - * proc_mkdir_mode exists in Linux 2.6.9, but isn't exported until Linux 3.0. -@@ -77,6 +90,44 @@ - remove_proc_entry(entry->name, entry->parent); - #endif - -+#if defined(NV_HAVE_PROC_OPS) -+#define NV_DEFINE_SINGLE_PROCFS_FILE(name, open_callback, close_callback) \ -+ static int nv_procfs_open_##name( \ -+ struct inode *inode, \ -+ struct file *filep \ -+ ) \ -+ { \ -+ int ret; \ -+ ret = single_open(filep, nv_procfs_read_##name, \ -+ NV_PDE_DATA(inode)); \ -+ if (ret < 0) \ -+ { \ -+ return ret; \ -+ } \ -+ ret = open_callback(); \ -+ if (ret < 0) \ -+ { \ -+ single_release(inode, filep); \ -+ } \ -+ return ret; \ -+ } \ -+ \ -+ static int nv_procfs_release_##name( \ -+ struct inode *inode, \ -+ struct file *filep \ -+ ) \ -+ { \ -+ close_callback(); \ -+ return single_release(inode, filep); \ -+ } \ -+ \ -+ static const struct proc_ops nv_procfs_##name##_fops = { \ -+ .proc_open = nv_procfs_open_##name, \ -+ .proc_read = seq_read, \ -+ .proc_lseek = seq_lseek, \ -+ .proc_release = nv_procfs_release_##name, \ -+ }; -+#else - #define NV_DEFINE_SINGLE_PROCFS_FILE(name, open_callback, close_callback) \ - static int nv_procfs_open_##name( \ - struct inode *inode, \ -@@ -114,6 +165,7 @@ - .llseek = seq_lseek, \ - .release = nv_procfs_release_##name, \ - }; -+#endif - - #endif /* CONFIG_PROC_FS */ - -diff -Nurp NVIDIA-Linux-x86_64-430.64.orig/kernel/common/inc/nv-time.h NVIDIA-Linux-x86_64-430.64/kernel/common/inc/nv-time.h ---- NVIDIA-Linux-x86_64-430.64.orig/kernel/common/inc/nv-time.h 2020-04-11 01:29:29.475036592 +0300 -+++ NVIDIA-Linux-x86_64-430.64/kernel/common/inc/nv-time.h 2020-04-11 01:28:48.300091052 +0300 -@@ -27,7 +27,12 @@ - - #include - --static inline void nv_gettimeofday(struct timeval *tv) -+struct nv_timeval { -+ __kernel_long_t tv_sec; -+ __kernel_suseconds_t tv_usec; -+}; -+ -+static inline void nv_gettimeofday(struct nv_timeval *tv) - { - #ifdef NV_DO_GETTIMEOFDAY_PRESENT - do_gettimeofday(tv); -@@ -36,7 +41,7 @@ static inline void nv_gettimeofday(struc - - ktime_get_real_ts64(&now); - -- *tv = (struct timeval) { -+ *tv = (struct nv_timeval) { - .tv_sec = now.tv_sec, - .tv_usec = now.tv_nsec/1000, - }; -diff -Nurp NVIDIA-Linux-x86_64-430.64.orig/kernel/conftest.sh NVIDIA-Linux-x86_64-430.64/kernel/conftest.sh ---- NVIDIA-Linux-x86_64-430.64.orig/kernel/conftest.sh 2020-04-11 01:29:29.476036639 +0300 -+++ NVIDIA-Linux-x86_64-430.64/kernel/conftest.sh 2020-04-11 01:28:48.300091052 +0300 -@@ -777,6 +777,46 @@ compile_test() { - compile_check_conftest "$CODE" "NV_FILE_OPERATIONS_HAS_IOCTL" "" "types" - ;; - -+ proc_ops) -+ CODE=" -+ #include -+ int conftest_proc_ops(void) { -+ return offsetof(struct proc_ops, proc_open); -+ }" -+ -+ compile_check_conftest "$CODE" "NV_HAVE_PROC_OPS" "" "types" -+ ;; -+ -+ ktime_get_raw_ts64) -+ # -+ # Determine if the ktime_get_raw_ts64() function is present. -+ # -+ CODE=" -+ #include -+ int conftest_ktime_get_raw_ts64(void) { -+ struct timespec64 ts = {0}; -+ -+ ktime_get_raw_ts64(&ts64); -+ }" -+ -+ compile_check_conftest "$CODE" "NV_KTIME_GET_RAW_TS64_PRESENT" "" "functions" -+ ;; -+ -+ ktime_get_real_ts64) -+ # -+ # Determine if the ktime_get_real_ts64() function is present. -+ # -+ CODE=" -+ #include -+ int conftest_ktime_get_raw_ts64(void) { -+ struct timespec64 ts = {0}; -+ -+ ktime_get_real_ts64(&ts64); -+ }" -+ -+ compile_check_conftest "$CODE" "NV_KTIME_GET_REAL_TS64_PRESENT" "" "functions" -+ ;; -+ - sg_alloc_table) - # - # sg_alloc_table_from_pages added by commit efc42bc98058 -diff -Nurp NVIDIA-Linux-x86_64-430.64.orig/kernel/nvidia/linux_nvswitch.c NVIDIA-Linux-x86_64-430.64/kernel/nvidia/linux_nvswitch.c ---- NVIDIA-Linux-x86_64-430.64.orig/kernel/nvidia/linux_nvswitch.c 2020-04-11 01:29:29.476036639 +0300 -+++ NVIDIA-Linux-x86_64-430.64/kernel/nvidia/linux_nvswitch.c 2020-04-11 01:28:48.301091099 +0300 -@@ -1581,10 +1581,17 @@ nvswitch_os_get_platform_time - void - ) - { -+#if defined(NV_KTIME_GET_REAL_TS64_PRESENT) -+ struct timespec64 ts64; -+ -+ ktime_get_real_ts64(&ts64); -+ return ((NvU64)(ts64.tv_sec * NSEC_PER_SEC) + ts64.tv_nsec); -+#else - struct timespec ts; - - getnstimeofday(&ts); - return ((NvU64) timespec_to_ns(&ts)); -+#endif - } - - void -diff -Nurp NVIDIA-Linux-x86_64-430.64.orig/kernel/nvidia/nvidia.Kbuild NVIDIA-Linux-x86_64-430.64/kernel/nvidia/nvidia.Kbuild ---- NVIDIA-Linux-x86_64-430.64.orig/kernel/nvidia/nvidia.Kbuild 2020-04-11 01:29:29.476036639 +0300 -+++ NVIDIA-Linux-x86_64-430.64/kernel/nvidia/nvidia.Kbuild 2020-04-11 01:28:48.301091099 +0300 -@@ -149,6 +149,9 @@ NV_CONFTEST_TYPE_COMPILE_TESTS += acpi_o - NV_CONFTEST_TYPE_COMPILE_TESTS += outer_flush_all - NV_CONFTEST_TYPE_COMPILE_TESTS += scatterlist - NV_CONFTEST_TYPE_COMPILE_TESTS += file_operations -+NV_CONFTEST_TYPE_COMPILE_TESTS += proc_ops -+NV_CONFTEST_TYPE_COMPILE_TESTS += ktime_get_raw_ts64 -+NV_CONFTEST_TYPE_COMPILE_TESTS += ktime_get_real_ts64 - NV_CONFTEST_TYPE_COMPILE_TESTS += vm_operations_struct - NV_CONFTEST_TYPE_COMPILE_TESTS += atomic_long_type - NV_CONFTEST_TYPE_COMPILE_TESTS += file_inode -diff -Nurp NVIDIA-Linux-x86_64-430.64.orig/kernel/nvidia/nvlink_linux.c NVIDIA-Linux-x86_64-430.64/kernel/nvidia/nvlink_linux.c ---- NVIDIA-Linux-x86_64-430.64.orig/kernel/nvidia/nvlink_linux.c 2020-04-11 01:29:29.476036639 +0300 -+++ NVIDIA-Linux-x86_64-430.64/kernel/nvidia/nvlink_linux.c 2020-04-11 01:28:48.301091099 +0300 -@@ -510,8 +510,8 @@ void * NVLINK_API_CALL nvlink_memcpy(voi - - static NvBool nv_timer_less_than - ( -- const struct timeval *a, -- const struct timeval *b -+ const struct nv_timeval *a, -+ const struct nv_timeval *b - ) - { - return (a->tv_sec == b->tv_sec) ? (a->tv_usec < b->tv_usec) -@@ -520,9 +520,9 @@ static NvBool nv_timer_less_than - - static void nv_timeradd - ( -- const struct timeval *a, -- const struct timeval *b, -- struct timeval *result -+ const struct nv_timeval *a, -+ const struct nv_timeval *b, -+ struct nv_timeval *result - ) - { - result->tv_sec = a->tv_sec + b->tv_sec; -@@ -536,9 +536,9 @@ static void nv_timeradd - - static void nv_timersub - ( -- const struct timeval *a, -- const struct timeval *b, -- struct timeval *result -+ const struct nv_timeval *a, -+ const struct nv_timeval *b, -+ struct nv_timeval *result - ) - { - result->tv_sec = a->tv_sec - b->tv_sec; -@@ -558,7 +558,7 @@ void NVLINK_API_CALL nvlink_sleep(unsign - unsigned long us; - unsigned long jiffies; - unsigned long mdelay_safe_msec; -- struct timeval tm_end, tm_aux; -+ struct nv_timeval tm_end, tm_aux; - - nv_gettimeofday(&tm_aux); - -diff -Nurp NVIDIA-Linux-x86_64-430.64.orig/kernel/nvidia/nv-procfs.c NVIDIA-Linux-x86_64-430.64/kernel/nvidia/nv-procfs.c ---- NVIDIA-Linux-x86_64-430.64.orig/kernel/nvidia/nv-procfs.c 2020-04-11 01:29:29.476036639 +0300 -+++ NVIDIA-Linux-x86_64-430.64/kernel/nvidia/nv-procfs.c 2020-04-11 01:28:48.301091099 +0300 -@@ -482,6 +482,15 @@ done: - return ((status < 0) ? status : (int)count); - } - -+#if defined(NV_HAVE_PROC_OPS) -+static struct proc_ops nv_procfs_registry_fops = { -+ .proc_open = nv_procfs_open_registry, -+ .proc_read = seq_read, -+ .proc_write = nv_procfs_write_file, -+ .proc_lseek = seq_lseek, -+ .proc_release = nv_procfs_close_registry, -+}; -+#else - static struct file_operations nv_procfs_registry_fops = { - .owner = THIS_MODULE, - .open = nv_procfs_open_registry, -@@ -490,6 +499,7 @@ static struct file_operations nv_procfs_ - .llseek = seq_lseek, - .release = nv_procfs_close_registry, - }; -+#endif - - #if defined(CONFIG_PM) - static int -@@ -561,6 +571,15 @@ nv_procfs_open_suspend_depth( - return single_open(file, nv_procfs_show_suspend_depth, NULL); - } - -+#if defined(NV_HAVE_PROC_OPS) -+static struct proc_ops nv_procfs_suspend_depth_fops = { -+ .proc_open = nv_procfs_open_suspend_depth, -+ .proc_read = seq_read, -+ .proc_write = nv_procfs_write_suspend_depth, -+ .proc_lseek = seq_lseek, -+ .proc_release = single_release -+}; -+#else - static struct file_operations nv_procfs_suspend_depth_fops = { - .owner = THIS_MODULE, - .open = nv_procfs_open_suspend_depth, -@@ -569,6 +588,7 @@ static struct file_operations nv_procfs_ - .llseek = seq_lseek, - .release = single_release - }; -+#endif - - static int - nv_procfs_show_suspend( -@@ -643,6 +663,15 @@ nv_procfs_open_suspend( - return single_open(file, nv_procfs_show_suspend, NULL); - } - -+#if defined(NV_HAVE_PROC_OPS) -+static struct proc_ops nv_procfs_suspend_fops = { -+ .proc_open = nv_procfs_open_suspend, -+ .proc_read = seq_read, -+ .proc_write = nv_procfs_write_suspend, -+ .proc_lseek = seq_lseek, -+ .proc_release = single_release -+}; -+#else - static struct file_operations nv_procfs_suspend_fops = { - .owner = THIS_MODULE, - .open = nv_procfs_open_suspend, -@@ -652,6 +681,7 @@ static struct file_operations nv_procfs_ - .release = single_release - }; - #endif -+#endif - - /* - * Forwards error to nv_log_error which exposes data to vendor callback -@@ -754,12 +784,20 @@ done: - return status; - } - -+#if defined(NV_HAVE_PROC_OPS) -+static struct proc_ops nv_procfs_exercise_error_forwarding_fops = { -+ .proc_open = nv_procfs_open_exercise_error_forwarding, -+ .proc_write = nv_procfs_write_file, -+ .proc_release = nv_procfs_close_exercise_error_forwarding, -+}; -+#else - static struct file_operations nv_procfs_exercise_error_forwarding_fops = { - .owner = THIS_MODULE, - .open = nv_procfs_open_exercise_error_forwarding, - .write = nv_procfs_write_file, - .release = nv_procfs_close_exercise_error_forwarding, - }; -+#endif - - static int - nv_procfs_read_unbind_lock( -@@ -881,6 +919,15 @@ done: - return rc; - } - -+#if defined(NV_HAVE_PROC_OPS) -+static struct proc_ops nv_procfs_unbind_lock_fops = { -+ .proc_open = nv_procfs_open_unbind_lock, -+ .proc_read = seq_read, -+ .proc_write = nv_procfs_write_file, -+ .proc_lseek = seq_lseek, -+ .proc_release = nv_procfs_close_unbind_lock, -+}; -+#else - static struct file_operations nv_procfs_unbind_lock_fops = { - .owner = THIS_MODULE, - .open = nv_procfs_open_unbind_lock, -@@ -889,6 +936,7 @@ static struct file_operations nv_procfs_ - .llseek = seq_lseek, - .release = nv_procfs_close_unbind_lock, - }; -+#endif - - static const char* - numa_status_describe(nv_numa_status_t state) -@@ -1217,6 +1265,22 @@ done: - return retval; - } - -+#if defined(NV_HAVE_PROC_OPS) -+static const struct proc_ops nv_procfs_numa_status_fops = { -+ .proc_open = nv_procfs_open_numa_status, -+ .proc_read = seq_read, -+ .proc_write = nv_procfs_write_file, -+ .proc_lseek = seq_lseek, -+ .proc_release = nv_procfs_close_numa_status, -+}; -+ -+static const struct proc_ops nv_procfs_offline_pages_fops = { -+ .proc_open = nv_procfs_open_offline_pages, -+ .proc_read = seq_read, -+ .proc_lseek = seq_lseek, -+ .proc_release = nv_procfs_close_offline_pages, -+}; -+#else - static const struct file_operations nv_procfs_numa_status_fops = { - .owner = THIS_MODULE, - .open = nv_procfs_open_numa_status, -@@ -1233,6 +1297,7 @@ static const struct file_operations nv_p - .llseek = seq_lseek, - .release = nv_procfs_close_offline_pages, - }; -+#endif - - static int - nv_procfs_read_text_file( -diff -Nurp NVIDIA-Linux-x86_64-430.64.orig/kernel/nvidia/os-interface.c NVIDIA-Linux-x86_64-430.64/kernel/nvidia/os-interface.c ---- NVIDIA-Linux-x86_64-430.64.orig/kernel/nvidia/os-interface.c 2020-04-11 01:29:29.476036639 +0300 -+++ NVIDIA-Linux-x86_64-430.64/kernel/nvidia/os-interface.c 2020-04-11 01:28:48.301091099 +0300 -@@ -452,7 +452,7 @@ NV_STATUS NV_API_CALL os_get_current_tim - NvU32 *useconds - ) - { -- struct timeval tm; -+ struct nv_timeval tm; - - nv_gettimeofday(&tm); - -@@ -466,9 +466,15 @@ NV_STATUS NV_API_CALL os_get_current_tim - - void NV_API_CALL os_get_current_tick(NvU64 *nseconds) - { -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 5, 0) -+ struct timespec64 ts; -+ -+ jiffies_to_timespec64(jiffies, &ts); -+#else - struct timespec ts; - - jiffies_to_timespec(jiffies, &ts); -+#endif - - *nseconds = ((NvU64)ts.tv_sec * NSEC_PER_SEC + (NvU64)ts.tv_nsec); - } -@@ -538,7 +544,7 @@ NV_STATUS NV_API_CALL os_delay_us(NvU32 - unsigned long usec; - - #ifdef NV_CHECK_DELAY_ACCURACY -- struct timeval tm1, tm2; -+ struct nv_timeval tm1, tm2; - - nv_gettimeofday(&tm1); - #endif -@@ -578,9 +584,9 @@ NV_STATUS NV_API_CALL os_delay(NvU32 Mil - unsigned long MicroSeconds; - unsigned long jiffies; - unsigned long mdelay_safe_msec; -- struct timeval tm_end, tm_aux; -+ struct nv_timeval tm_end, tm_aux; - #ifdef NV_CHECK_DELAY_ACCURACY -- struct timeval tm_start; -+ struct nv_timeval tm_start; - #endif - - nv_gettimeofday(&tm_aux); -@@ -1925,7 +1931,7 @@ static NV_STATUS NV_API_CALL _os_ipmi_re - { - struct ipmi_recv_msg *rx_msg; - int err_no; -- struct timeval tv; -+ struct nv_timeval tv; - NvU64 start_time; - - nv_gettimeofday(&tv); -diff -Nurp NVIDIA-Linux-x86_64-430.64.orig/kernel/nvidia-modeset/nvidia-modeset-linux.c NVIDIA-Linux-x86_64-430.64/kernel/nvidia-modeset/nvidia-modeset-linux.c ---- NVIDIA-Linux-x86_64-430.64.orig/kernel/nvidia-modeset/nvidia-modeset-linux.c 2020-04-11 01:29:29.477036687 +0300 -+++ NVIDIA-Linux-x86_64-430.64/kernel/nvidia-modeset/nvidia-modeset-linux.c 2020-04-11 01:28:48.302091146 +0300 -@@ -279,7 +279,7 @@ void NVKMS_API_CALL nvkms_usleep(NvU64 u - - NvU64 NVKMS_API_CALL nvkms_get_usec(void) - { -- struct timeval tv; -+ struct nv_timeval tv; - - nv_gettimeofday(&tv); - -diff -Nurp NVIDIA-Linux-x86_64-430.64.orig/kernel/nvidia-uvm/uvm_linux.h NVIDIA-Linux-x86_64-430.64/kernel/nvidia-uvm/uvm_linux.h ---- NVIDIA-Linux-x86_64-430.64.orig/kernel/nvidia-uvm/uvm_linux.h 2020-04-11 01:29:29.477036687 +0300 -+++ NVIDIA-Linux-x86_64-430.64/kernel/nvidia-uvm/uvm_linux.h 2020-04-11 01:28:48.302091146 +0300 -@@ -298,7 +298,16 @@ static inline uint64_t NV_DIV64(uint64_t - } - #endif - --#if defined(CLOCK_MONOTONIC_RAW) -+#if defined(NV_KTIME_GET_RAW_TS64_PRESENT) -+static inline NvU64 NV_GETTIME(void) -+{ -+ struct timespec64 ts; -+ -+ ktime_get_raw_ts64(&ts); -+ -+ return (ts.tv_sec * 1000000000ULL + ts.tv_nsec); -+} -+#elif defined(CLOCK_MONOTONIC_RAW) - /* Return a nanosecond-precise value */ - static inline NvU64 NV_GETTIME(void) - { -@@ -314,7 +323,7 @@ static inline NvU64 NV_GETTIME(void) - * available non-GPL symbols. */ - static inline NvU64 NV_GETTIME(void) - { -- struct timeval tv = {0}; -+ struct nv_timeval tv = {0}; - - nv_gettimeofday(&tv); - diff --git a/kernel/drivers/module-nvidia465/files/mageia/NVIDIA-Linux-x86_64-430.64-work-around-mga-bug-25890.patch b/kernel/drivers/module-nvidia465/files/mageia/NVIDIA-Linux-x86_64-430.64-work-around-mga-bug-25890.patch deleted file mode 100644 index ccac0dbabf..0000000000 --- a/kernel/drivers/module-nvidia465/files/mageia/NVIDIA-Linux-x86_64-430.64-work-around-mga-bug-25890.patch +++ /dev/null @@ -1,45 +0,0 @@ - -In this bug: -https://bugs.mageia.org/show_bug.cgi?id=25890 - -The nvidia-current conftest.sh falsely detects support for -set_memory_array_uc/wb() in 5.4 series kernels - -Fix it by adding linux kernel version checks to exclude the unsuppoorted code - -Signed-off-by: Thomas Backlund - -diff -Nurp NVIDIA-Linux-x86_64-430.64.orig/kernel/nvidia/nv-vm.c NVIDIA-Linux-x86_64-430.64/kernel/nvidia/nv-vm.c ---- NVIDIA-Linux-x86_64-430.64.orig/kernel/nvidia/nv-vm.c 2019-10-27 13:48:11.000000000 +0200 -+++ NVIDIA-Linux-x86_64-430.64/kernel/nvidia/nv-vm.c 2019-12-29 23:54:36.176732208 +0200 -@@ -42,12 +42,14 @@ static inline int nv_set_memory_array_ty - { - switch (type) - { -+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 4, 0) - #if defined(NV_SET_MEMORY_ARRAY_UC_PRESENT) - case NV_MEMORY_UNCACHED: - return 1; - case NV_MEMORY_WRITEBACK: - return 1; - #endif -+#endif - default: - return 0; - } -@@ -61,6 +63,7 @@ static inline void nv_set_memory_array_t - { - switch (type) - { -+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 4, 0) - #if defined(NV_SET_MEMORY_ARRAY_UC_PRESENT) - case NV_MEMORY_UNCACHED: - set_memory_array_uc(pages, num_pages); -@@ -69,6 +72,7 @@ static inline void nv_set_memory_array_t - set_memory_array_wb(pages, num_pages); - break; - #endif -+#endif - default: - nv_printf(NV_DBG_ERRORS, - "NVRM: %s(): type %d unimplemented\n", diff --git a/kernel/drivers/module-nvidia465/files/modprobe.conf b/kernel/drivers/module-nvidia465/files/modprobe.conf deleted file mode 100644 index c9b9bfcf71..0000000000 --- a/kernel/drivers/module-nvidia465/files/modprobe.conf +++ /dev/null @@ -1,2 +0,0 @@ -blacklist nouveau -options nouveau modeset=0 diff --git a/kernel/drivers/module-nvidia465/files/nvidia.txt b/kernel/drivers/module-nvidia465/files/nvidia.txt deleted file mode 100644 index 8b13789179..0000000000 --- a/kernel/drivers/module-nvidia465/files/nvidia.txt +++ /dev/null @@ -1 +0,0 @@ - diff --git a/kernel/drivers/module-nvidia465/files/xorg.conf b/kernel/drivers/module-nvidia465/files/xorg.conf deleted file mode 100644 index 9c36f59b54..0000000000 --- a/kernel/drivers/module-nvidia465/files/xorg.conf +++ /dev/null @@ -1,8 +0,0 @@ -Section "OutputClass" - Identifier "nvidia" - MatchDriver "nvidia-drm" - Driver "nvidia" - Option "AllowEmptyInitialConfiguration" - ModulePath "/usr/lib/nvidia/xorg" - ModulePath "/usr/lib/xorg/modules" -EndSection diff --git a/kernel/drivers/module-nvidia465/pspec.xml b/kernel/drivers/module-nvidia465/pspec.xml deleted file mode 100644 index 9fdf3fd394..0000000000 --- a/kernel/drivers/module-nvidia465/pspec.xml +++ /dev/null @@ -1,283 +0,0 @@ - - - - - module-nvidia465 - http://www.nvidia.com - - Marcin Bojara - marcin@pisilinux.org - - NVIDIA - NVIDIA drivers for GeForce 6xxx and newer GPUs - NVIDIA graphics drivers provide optimized 2D/3D performance. - http://http.download.nvidia.com/XFree86/Linux-x86_64/465.31/NVIDIA-Linux-x86_64-465.31.run - - kernel-module-headers - libX11-devel - gtk2-devel - gtk3-devel - - - dkms.conf - mageia/NVIDIA-Linux-x86_64-430.64-kernel-5.5.patch - mageia/NVIDIA-Linux-x86_64-430.64-kernel-5.6.patch - mageia/NVIDIA-Linux-x86_64-430.64-work-around-mga-bug-25890.patch - - - - - module-nvidia465 - driver - Kernel module for current NVIDIA graphics driver releases - - kernel - - - - /lib/modules - /etc/modprobe.d - - - modprobe.conf - - - noDelta - - - nvidia465-dkms - - - - - - - - - xorg-video-nvidia465 - driver - - libXext - libX11 - mesa - xorg-server - opencl-icd - vulkan - libglvnd - - module-nvidia465 - nvidia465-dkms - - - - /etc/OpenCL - /usr/bin - /usr/lib - /usr/share/X11 - /usr/share/nvidia465 - /usr/share/doc - /usr/share/man - - - noDelta - - - System.Package - - - - - xorg-video-nvidia465-32bit - emul32 - 32-bit shared libraries for xorg-video-nvidia465 - emul32 - - libvdpau-32bit - - - zlib-32bit - mesa-32bit - libX11-32bit - libXext-32bit - opencl-icd-32bit - vulkan-32bit - libglvnd-32bit - xorg-video-nvidia465 - atk - gtk2 - gtk3 - cairo - glib2 - pango - gdk-pixbuf - - - /usr/lib32 - /usr/share/nvidia465/32bit-ld.so.conf - - - noDelta - - - - - nvidia465-dkms - driver - NVIDIA driver sources for linux - - dkms - xorg-video-nvidia465 - - - /etc/modprobe.d/nvidia465-dkms.conf - /usr/src/nvidia* - - - modprobe.conf - xorg.conf - - - noDelta - - - module-nvidia465 - nvidia-current-dkms - nvidia390-dkms - nvidia340-dkms - nvidia465 - - - - - nvidia465 - driver - Meata package for nvidia465 drivers - - module-nvidia465 - xorg-video-nvidia465 - - - /var/tmp/nvidia - - - noDelta - - - nvidia390-dkms - - - nvidia.txt - - - - - - 2021-05-30 - 465.31 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2021-01-29 - 430.64 - Rebuild. - Mustafa Cinasal - muscnsl@gmail.com - - - 2020-07-05 - 430.64 - Add comar script and meta package - Marcin Bojara - marcin.bojara@gmail.com - - - 2020-06-01 - 430.64 - Rebuild. - Mustafa Cinasal Bojara - muscnsl@gmail.com - - - 2020-04-03 - 430.64 - Rebuild. - Mustafa Cinasal Bojara - muscnsl@gmail.com - - - 2020-01-31 - 430.64 - Rebuild. - Mustafa Cinasal Bojara - muscnsl@gmail.com - - - 2020-01-09 - 430.64 - Add dkms support - Marcin Bojara - marcin.bojara@gmail.com - - - 2019-11-03 - 430.64 - First release - İdris Kalp - idriskalp@gmail.com - - - diff --git a/kernel/drivers/module-nvidia465/translations.xml b/kernel/drivers/module-nvidia465/translations.xml deleted file mode 100644 index dec069b65a..0000000000 --- a/kernel/drivers/module-nvidia465/translations.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - module-nvidia430 - GeForce 6xxx ve daha yeni NVIDIA ekran kartları için sürücüler - NVIDIA grafik sürücüleri daha iyi 2B/3B başarımı sağlar. - Controladores de kernel nVIDIA y glx para rendimiento optimizado 2d/3d en Linux (Para NV3X o mejor). - Controladores nVIDIA de kernel y glx para tarjetas NV3 o mejor (Geforce FX o mejor) - - - - module-nvidia430 - Güncel NVIDIA grafik sürücüleri için çekirdek modülü - - - - xorg-video-nvidia430 - Güncel NVIDIA userspace sürücüleri ve ikili dosyaları - - - - xorg-video-nvidia430-32bit - xorg-video-nvidia-current için 32-bit paylaşımlı kitaplıklar - -