nvidia-current: add dkms

2020-01-07 23:03:45 +01:00
parent 5cb6b13fe6
commit 7af4c0483a
10 changed files with 262 additions and 378 deletions
@@ -1,50 +0,0 @@
-diff -Nurp NVIDIA-Linux-x86_64-390.87.orig/kernel/nvidia-drm/nvidia-drm-connector.c NVIDIA-Linux-x86_64-390.87/kernel/nvidia-drm/nvidia-drm-connector.c
--- NVIDIA-Linux-x86_64-390.87.orig/kernel/nvidia-drm/nvidia-drm-connector.c	2018-08-22 03:55:29.000000000 +0300
-+++ NVIDIA-Linux-x86_64-390.87/kernel/nvidia-drm/nvidia-drm-connector.c	2018-11-09 19:46:54.625801192 +0200
-@@ -30,6 +30,8 @@
- #include "nvidia-drm-utils.h"
- #include "nvidia-drm-encoder.h"
- 
-+#include <linux/version.h>
-+
- #include <drm/drm_crtc_helper.h>
- 
- #include <drm/drm_atomic.h>
-@@ -226,8 +228,13 @@ static int nv_drm_connector_get_modes(st
- 
- 
-     if (nv_connector->edid != NULL) {
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 19, 0)
-         drm_mode_connector_update_edid_property(
-             connector, nv_connector->edid);
-+#else
-+        drm_connector_update_edid_property(
-+            connector, nv_connector->edid);
-+#endif
-     }
- 
-     while (1) {
-diff -Nurp NVIDIA-Linux-x86_64-390.87.orig/kernel/nvidia-drm/nvidia-drm-encoder.c NVIDIA-Linux-x86_64-390.87/kernel/nvidia-drm/nvidia-drm-encoder.c
--- NVIDIA-Linux-x86_64-390.87.orig/kernel/nvidia-drm/nvidia-drm-encoder.c	2018-08-22 03:55:29.000000000 +0300
-+++ NVIDIA-Linux-x86_64-390.87/kernel/nvidia-drm/nvidia-drm-encoder.c	2018-11-09 19:49:34.863861811 +0200
-@@ -30,6 +30,8 @@
- #include "nvidia-drm-connector.h"
- #include "nvidia-drm-crtc.h"
- 
-+#include <linux/version.h>
-+
- #include <drm/drm_crtc_helper.h>
- 
- #include <drm/drm_atomic.h>
-@@ -216,7 +218,11 @@ nv_drm_add_encoder(struct drm_device *de
- 
-     /* Attach encoder and connector */
- 
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 19, 0)
-     ret = drm_mode_connector_attach_encoder(connector, encoder);
-+#else
-+    ret = drm_connector_attach_encoder(connector, encoder);
-+#endif
- 
-     if (ret != 0) {
-         NV_DRM_DEV_LOG_ERR(
@@ -1,43 +0,0 @@
--- a/kernel/nvidia/os-interface.c
-+++ b/kernel/nvidia/os-interface.c
-@@ -1670,7 +1670,7 @@
- 
- struct nv_ipmi_softc
- {
-    ipmi_user_t         p_user;     // ptr to ipmi_msghandler user structure
-+    struct ipmi_user    *p_user;
-     spinlock_t          msg_lock;
-     struct list_head    msgs;
-     NvU32               seqNum;     //request sequence number
-@@ -1679,7 +1679,7 @@
- static inline int
- nv_ipmi_set_my_address
- (
-    ipmi_user_t     user,
-+    struct ipmi_user *user,
-     unsigned char   address
- )
- {
--- a/kernel/nvidia-drm/nvidia-drm-gem-nvkms-memory.c
-+++ b/kernel/nvidia-drm/nvidia-drm-gem-nvkms-memory.c
-@@ -20,6 +20,8 @@
-  * DEALINGS IN THE SOFTWARE.
-  */
- 
-+#include <linux/version.h>
-+
- #include "nvidia-drm-conftest.h"
- 
- #if defined(NV_DRM_ATOMIC_MODESET_AVAILABLE)
-@@ -345,7 +347,11 @@ static int __nv_drm_vma_fault(struct vm_area_struct *vma,
- 
-     page_offset = vmf->pgoff - drm_vma_node_start(&gem->vma_node);
- 
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 19, 0)
-     ret = vm_insert_pfn(vma, address, pfn + page_offset);
-+#else
-+    ret = vmf_insert_pfn(vma, address, pfn + page_offset);
-+#endif
- 
-     switch (ret) {
-         case 0:
@@ -0,0 +1,19 @@
+PACKAGE_NAME="nvidia"
+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' -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"
@@ -0,0 +1,8 @@
+Section "OutputClass"
+    Identifier "nvidia"
+    MatchDriver "nvidia-drm"
+    Driver "nvidia"
+    Option "AllowEmptyInitialConfiguration"
+    ModulePath "/usr/lib/nvidia/xorg"
+    ModulePath "/usr/lib/xorg/modules"
+EndSection