summaryrefslogtreecommitdiff
path: root/sys-kernel/nvidia-drivers-dkms/files
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2020-01-04 18:15:29 +0000
committerV3n3RiX <venerix@redcorelinux.org>2020-01-04 18:15:29 +0000
commit06309ca72984637cbc504fbf1b463bce3842ee54 (patch)
tree4177087a4af6e6163c3842d95e8757781638da11 /sys-kernel/nvidia-drivers-dkms/files
parenta2a4c24c40067b5cf36719753b49057aba960998 (diff)
x11-drivers/nvidia-drivers && x11-misc/nvidia-settings && sys-kernel/nvidia-drivers-dkms : drop old
Diffstat (limited to 'sys-kernel/nvidia-drivers-dkms/files')
-rw-r--r--sys-kernel/nvidia-drivers-dkms/files/kernel-5.1.patch130
-rw-r--r--sys-kernel/nvidia-drivers-dkms/files/kernel-5.2.patch18
-rw-r--r--sys-kernel/nvidia-drivers-dkms/files/nvidia-drivers-440.44-conf.patch28
-rw-r--r--sys-kernel/nvidia-drivers-dkms/files/nvidia-drivers-dkms-390.116-conf.patch28
-rw-r--r--sys-kernel/nvidia-drivers-dkms/files/nvidia-drivers-dkms-430.34-conf.patch28
5 files changed, 0 insertions, 232 deletions
diff --git a/sys-kernel/nvidia-drivers-dkms/files/kernel-5.1.patch b/sys-kernel/nvidia-drivers-dkms/files/kernel-5.1.patch
deleted file mode 100644
index 172ff48e..00000000
--- a/sys-kernel/nvidia-drivers-dkms/files/kernel-5.1.patch
+++ /dev/null
@@ -1,130 +0,0 @@
-diff --git a/kernel/common/inc/nv-list-helpers.h b/kernel/common/inc/nv-list-helpers.h
-index 0aed851..d6304c9 100644
---- a/kernel/common/inc/nv-list-helpers.h
-+++ b/kernel/common/inc/nv-list-helpers.h
-@@ -26,6 +26,8 @@
- #include <linux/list.h>
- #include "conftest.h"
-
-+#include <linux/version.h>
-+
- #if !defined (list_for_each)
- #define list_for_each(pos, head) \
- for (pos = (head)->next; pos != (head); pos = (pos)->next)
-@@ -91,10 +93,12 @@
- list_entry((pos)->member.next, typeof(*(pos)), member)
- #endif
-
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 1, 0)
- static inline int list_is_first(const struct list_head *list,
- const struct list_head *head)
- {
- return list->prev == head;
- }
-+#endif
-
- #endif // __NV_LIST_HELPERS_H__
-diff --git a/kernel/nvidia-drm/nvidia-drm-connector.c b/kernel/nvidia-drm/nvidia-drm-connector.c
-index 24631c0..ba1497c 100644
---- a/kernel/nvidia-drm/nvidia-drm-connector.c
-+++ b/kernel/nvidia-drm/nvidia-drm-connector.c
-@@ -30,7 +30,12 @@
- #include "nvidia-drm-utils.h"
- #include "nvidia-drm-encoder.h"
-
-+#include <linux/version.h>
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 1, 0)
- #include <drm/drm_crtc_helper.h>
-+#else
-+#include <drm/drm_probe_helper.h>
-+#endif
-
- #include <drm/drm_atomic.h>
- #include <drm/drm_atomic_helper.h>
-diff --git a/kernel/nvidia-drm/nvidia-drm-drv.c b/kernel/nvidia-drm/nvidia-drm-drv.c
-index 1c2db68..d524d51 100644
---- a/kernel/nvidia-drm/nvidia-drm-drv.c
-+++ b/kernel/nvidia-drm/nvidia-drm-drv.c
-@@ -41,7 +41,12 @@
-
- #include <drm/drmP.h>
-
-+#include <linux/version.h>
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 1, 0)
- #include <drm/drm_crtc_helper.h>
-+#else
-+#include <drm/drm_probe_helper.h>
-+#endif
-
- #if defined(NV_DRM_DRM_GEM_H_PRESENT)
- #include <drm/drm_gem.h>
-diff --git a/kernel/nvidia-drm/nvidia-drm-encoder.c b/kernel/nvidia-drm/nvidia-drm-encoder.c
-index f66bbd7..df38042 100644
---- a/kernel/nvidia-drm/nvidia-drm-encoder.c
-+++ b/kernel/nvidia-drm/nvidia-drm-encoder.c
-@@ -31,7 +31,12 @@
- #include "nvidia-drm-crtc.h"
- #include "nvidia-drm-helper.h"
-
-+#include <linux/version.h>
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 1, 0)
- #include <drm/drm_crtc_helper.h>
-+#else
-+#include <drm/drm_probe_helper.h>
-+#endif
-
- #include <drm/drm_atomic.h>
- #include <drm/drm_atomic_helper.h>
-diff --git a/kernel/nvidia-drm/nvidia-drm-gem-nvkms-memory.c b/kernel/nvidia-drm/nvidia-drm-gem-nvkms-memory.c
-index 8636eff..fd0c8da 100644
---- a/kernel/nvidia-drm/nvidia-drm-gem-nvkms-memory.c
-+++ b/kernel/nvidia-drm/nvidia-drm-gem-nvkms-memory.c
-@@ -29,6 +29,8 @@
-
- #include "nv-mm.h"
-
-+#include <linux/version.h>
-+
- static void __nv_drm_gem_nvkms_memory_free(struct nv_drm_gem_object *nv_gem)
- {
- struct nv_drm_device *nv_dev = nv_gem->nv_dev;
-@@ -268,7 +270,11 @@ static int __nv_drm_vma_fault(struct vm_area_struct *vma,
- */
-
- #if defined(NV_VM_OPS_FAULT_REMOVED_VMA_ARG)
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 1, 0)
- static int nv_drm_vma_fault(struct vm_fault *vmf)
-+#else
-+static vm_fault_t nv_drm_vma_fault(struct vm_fault *vmf)
-+#endif
- {
- return __nv_drm_vma_fault(vmf->vma, vmf);
- }
-diff --git a/kernel/nvidia-uvm/uvm8.c b/kernel/nvidia-uvm/uvm8.c
-index e00923d..2e01e3c 100644
---- a/kernel/nvidia-uvm/uvm8.c
-+++ b/kernel/nvidia-uvm/uvm8.c
-@@ -172,7 +172,11 @@ static int uvm_vm_fault_sigbus(struct vm_area_struct *vma, struct vm_fault *vmf)
- return VM_FAULT_SIGBUS;
- }
-
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 1, 0)
- static int uvm_vm_fault_sigbus_wrapper(struct vm_fault *vmf)
-+#else
-+static vm_fault_t uvm_vm_fault_sigbus_wrapper(struct vm_fault *vmf)
-+#endif
- {
- #if defined(NV_VM_OPS_FAULT_REMOVED_VMA_ARG)
- return uvm_vm_fault_sigbus(vmf->vma, vmf);
-@@ -507,7 +511,11 @@ convert_error:
- }
- }
-
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 1, 0)
- static int uvm_vm_fault_wrapper(struct vm_fault *vmf)
-+#else
-+static vm_fault_t uvm_vm_fault_wrapper(struct vm_fault *vmf)
-+#endif
- {
- #if defined(NV_VM_OPS_FAULT_REMOVED_VMA_ARG)
- return uvm_vm_fault(vmf->vma, vmf);
diff --git a/sys-kernel/nvidia-drivers-dkms/files/kernel-5.2.patch b/sys-kernel/nvidia-drivers-dkms/files/kernel-5.2.patch
deleted file mode 100644
index 344771d2..00000000
--- a/sys-kernel/nvidia-drivers-dkms/files/kernel-5.2.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -u -r a/kernel/nvidia-uvm/uvm8_tools.c b/kernel/nvidia-uvm/uvm8_tools.c
---- a/kernel/nvidia-uvm/uvm8_tools.c 2019-01-27 16:12:22.000000000 +0000
-+++ b/kernel/nvidia-uvm/uvm8_tools.c 2019-07-09 04:42:40.134899491 +0000
-@@ -204,12 +204,14 @@
- return event_tracker != NULL && !event_tracker->is_queue;
- }
-
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 2, 0)
- static void put_user_pages(struct page **pages, NvU64 page_count)
- {
- NvU64 i;
- for (i = 0; i < page_count; i++)
- put_page(pages[i]);
- }
-+#endif
-
- static void unmap_user_pages(struct page **pages, void *addr, NvU64 size)
- {
diff --git a/sys-kernel/nvidia-drivers-dkms/files/nvidia-drivers-440.44-conf.patch b/sys-kernel/nvidia-drivers-dkms/files/nvidia-drivers-440.44-conf.patch
deleted file mode 100644
index b889c5bc..00000000
--- a/sys-kernel/nvidia-drivers-dkms/files/nvidia-drivers-440.44-conf.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -Nur a/kernel/dkms.conf b/kernel/dkms.conf
---- a/kernel/dkms.conf 2019-05-09 19:10:50.000000000 +0100
-+++ b/kernel/dkms.conf 2019-06-22 16:04:07.646270011 +0100
-@@ -1,12 +1,20 @@
--PACKAGE_NAME="nvidia"
--PACKAGE_VERSION="__VERSION_STRING"
-+PACKAGE_NAME="nvidia-drivers-dkms"
-+PACKAGE_VERSION="440.44"
- 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' -j__JOBS NV_EXCLUDE_BUILD_MODULES='__EXCLUDE_MODULES' KERNEL_UNAME=${kernelver} IGNORE_CC_MISMATCH='__IGNORE_CC_MISMATCH' modules"
-+MAKE[0]="'make' -j`nproc` NV_EXCLUDE_BUILD_MODULES='__EXCLUDE_MODULES' KERNEL_UNAME=${kernelver} IGNORE_CC_MISMATCH='__IGNORE_CC_MISMATCH' modules"
-
- # The list of kernel modules will be generated by nvidia-installer at runtime.
--__DKMS_MODULES
-+BUILT_MODULE_NAME[0]="nvidia"
-+DEST_MODULE_LOCATION[0]="/extra/dkms"
-+BUILT_MODULE_NAME[1]="nvidia-uvm"
-+DEST_MODULE_LOCATION[1]="/extra/dkms"
-+BUILT_MODULE_NAME[2]="nvidia-modeset"
-+DEST_MODULE_LOCATION[2]="/extra/dkms"
-+BUILT_MODULE_NAME[3]="nvidia-drm"
-+DEST_MODULE_LOCATION[3]="/extra/dkms"
-+
diff --git a/sys-kernel/nvidia-drivers-dkms/files/nvidia-drivers-dkms-390.116-conf.patch b/sys-kernel/nvidia-drivers-dkms/files/nvidia-drivers-dkms-390.116-conf.patch
deleted file mode 100644
index 39736f59..00000000
--- a/sys-kernel/nvidia-drivers-dkms/files/nvidia-drivers-dkms-390.116-conf.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -Nur a/kernel/dkms.conf b/kernel/dkms.conf
---- a/kernel/dkms.conf 2018-03-22 05:39:53.000000000 +0000
-+++ b/kernel/dkms.conf 2018-04-09 16:18:23.177125417 +0100
-@@ -1,12 +1,20 @@
--PACKAGE_NAME="nvidia"
--PACKAGE_VERSION="__VERSION_STRING"
-+PACKAGE_NAME="nvidia-drivers-dkms"
-+PACKAGE_VERSION="390.116"
- 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' -j__JOBS NV_EXCLUDE_BUILD_MODULES='__EXCLUDE_MODULES' KERNEL_UNAME=${kernelver} modules"
-+MAKE[0]="'make' -j`nproc` NV_EXCLUDE_BUILD_MODULES='__EXCLUDE_MODULES' KERNEL_UNAME=${kernelver} modules"
-
- # The list of kernel modules will be generated by nvidia-installer at runtime.
--__DKMS_MODULES
-+BUILT_MODULE_NAME[0]="nvidia"
-+DEST_MODULE_LOCATION[0]="/extra/dkms"
-+BUILT_MODULE_NAME[1]="nvidia-uvm"
-+DEST_MODULE_LOCATION[1]="/extra/dkms"
-+BUILT_MODULE_NAME[2]="nvidia-modeset"
-+DEST_MODULE_LOCATION[2]="/extra/dkms"
-+BUILT_MODULE_NAME[3]="nvidia-drm"
-+DEST_MODULE_LOCATION[3]="/extra/dkms"
-+
diff --git a/sys-kernel/nvidia-drivers-dkms/files/nvidia-drivers-dkms-430.34-conf.patch b/sys-kernel/nvidia-drivers-dkms/files/nvidia-drivers-dkms-430.34-conf.patch
deleted file mode 100644
index 45bafe2a..00000000
--- a/sys-kernel/nvidia-drivers-dkms/files/nvidia-drivers-dkms-430.34-conf.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -Nur a/kernel/dkms.conf b/kernel/dkms.conf
---- a/kernel/dkms.conf 2019-05-09 19:10:50.000000000 +0100
-+++ b/kernel/dkms.conf 2019-06-22 16:04:07.646270011 +0100
-@@ -1,12 +1,20 @@
--PACKAGE_NAME="nvidia"
--PACKAGE_VERSION="__VERSION_STRING"
-+PACKAGE_NAME="nvidia-drivers-dkms"
-+PACKAGE_VERSION="430.34"
- 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' -j__JOBS NV_EXCLUDE_BUILD_MODULES='__EXCLUDE_MODULES' KERNEL_UNAME=${kernelver} IGNORE_CC_MISMATCH='__IGNORE_CC_MISMATCH' modules"
-+MAKE[0]="'make' -j`nproc` NV_EXCLUDE_BUILD_MODULES='__EXCLUDE_MODULES' KERNEL_UNAME=${kernelver} IGNORE_CC_MISMATCH='__IGNORE_CC_MISMATCH' modules"
-
- # The list of kernel modules will be generated by nvidia-installer at runtime.
--__DKMS_MODULES
-+BUILT_MODULE_NAME[0]="nvidia"
-+DEST_MODULE_LOCATION[0]="/extra/dkms"
-+BUILT_MODULE_NAME[1]="nvidia-uvm"
-+DEST_MODULE_LOCATION[1]="/extra/dkms"
-+BUILT_MODULE_NAME[2]="nvidia-modeset"
-+DEST_MODULE_LOCATION[2]="/extra/dkms"
-+BUILT_MODULE_NAME[3]="nvidia-drm"
-+DEST_MODULE_LOCATION[3]="/extra/dkms"
-+