diff options
| author | Britney Fransen <brfransen@gmail.com> | 2017-12-09 14:34:12 (GMT) |
|---|---|---|
| committer | Britney Fransen <brfransen@gmail.com> | 2017-12-09 14:34:12 (GMT) |
| commit | f06d8e1bedfcf6d424a4736d43f366d95fb33690 (patch) | |
| tree | a78baa8ac9914820a0c470c391772bcdb9e17b4d /abs/core/nvidia-304xx/kernel-4.14.patch | |
| parent | ada13c3f17134c5885f686509d128080450efa1b (diff) | |
| parent | e4b0dec19f02e6d8e995b19a22110cac26f07ac4 (diff) | |
| download | linhes_pkgbuild-f06d8e1bedfcf6d424a4736d43f366d95fb33690.zip linhes_pkgbuild-f06d8e1bedfcf6d424a4736d43f366d95fb33690.tar.gz linhes_pkgbuild-f06d8e1bedfcf6d424a4736d43f366d95fb33690.tar.bz2 | |
Merge branch 'testing'
Diffstat (limited to 'abs/core/nvidia-304xx/kernel-4.14.patch')
| -rw-r--r-- | abs/core/nvidia-304xx/kernel-4.14.patch | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/abs/core/nvidia-304xx/kernel-4.14.patch b/abs/core/nvidia-304xx/kernel-4.14.patch new file mode 100644 index 0000000..a38adbd --- /dev/null +++ b/abs/core/nvidia-304xx/kernel-4.14.patch @@ -0,0 +1,29 @@ +diff -u -r NVIDIA-Linux-x86_64-340.104-no-compat32/kernel/nv-drm.c NVIDIA-Linux-x86_64-340.104-no-compat32-kernel4.14/kernel/nv-drm.c +--- NVIDIA-Linux-x86_64-340.104-no-compat32/kernel/nv-drm.c 2017-09-15 01:16:51.000000000 +0200 ++++ NVIDIA-Linux-x86_64-340.104-no-compat32-kernel4.14/kernel/nv-drm.c 2017-11-19 00:51:45.006654148 +0100 +@@ -173,8 +173,12 @@ + { + int ret = 0; + #if defined(NV_DRM_AVAILABLE) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 14, 0) ++ ret = drm_legacy_pci_init(&nv_drm_driver, pci_driver); ++#else + ret = drm_pci_init(&nv_drm_driver, pci_driver); + #endif ++#endif + return ret; + } + +@@ -183,8 +187,12 @@ + ) + { + #if defined(NV_DRM_AVAILABLE) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 14, 0) ++ drm_legacy_pci_exit(&nv_drm_driver, pci_driver); ++#else + drm_pci_exit(&nv_drm_driver, pci_driver); + #endif ++#endif + } + + RM_STATUS NV_API_CALL nv_alloc_os_descriptor_handle( |