[arch-commits] Commit in nvidia-390xx/trunk (4 files)
Felix Yan
felixonmars at archlinux.org
Tue Jan 28 16:39:37 UTC 2020
Date: Tuesday, January 28, 2020 @ 16:39:36
Author: felixonmars
Revision: 374205
upgpkg: nvidia-390xx 390.132-21 rebuild for linux 5.5
Added:
nvidia-390xx/trunk/kernel-5.5.patch
Modified:
nvidia-390xx/trunk/PKGBUILD
Deleted:
nvidia-390xx/trunk/kernel-5.1.patch
nvidia-390xx/trunk/kernel-5.2.patch
------------------+
PKGBUILD | 10 -
kernel-5.1.patch | 130 -----------------
kernel-5.2.patch | 18 --
kernel-5.5.patch | 395 +++++++++++++++++++++++++++++++++++++++++++++++++++++
4 files changed, 402 insertions(+), 151 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2020-01-28 16:13:28 UTC (rev 374204)
+++ PKGBUILD 2020-01-28 16:39:36 UTC (rev 374205)
@@ -5,7 +5,7 @@
pkgbase=nvidia-390xx
pkgname=(nvidia-390xx nvidia-390xx-dkms)
pkgver=390.132
-pkgrel=20
+pkgrel=21
pkgdesc="NVIDIA drivers for linux, 390xx legacy branch"
arch=('x86_64')
url="https://www.nvidia.com/"
@@ -15,9 +15,11 @@
options=('!strip')
_pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
source=("https://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run"
- 'kernel-4.16.patch')
+ 'kernel-4.16.patch'
+ 'kernel-5.5.patch')
sha256sums=('b6b4b8af37e78e026c9ebdf4a5c64ea412dfcb710931dd028c22dac228de659d'
- '622ac792ec200b2239cb663c0010392118b78c9904973d82cd261165c16d6385')
+ '622ac792ec200b2239cb663c0010392118b78c9904973d82cd261165c16d6385'
+ '93efb4bd03c9617d6030dd4966d7350ec7a4e09f71e0566586454f5366385fff')
prepare() {
sh "${_pkg}.run" --extract-only
@@ -27,6 +29,8 @@
# https://bugs.archlinux.org/task/58074
patch -Np1 -i ../kernel-4.16.patch
+ patch -Np1 -i ../kernel-5.5.patch
+
cp -a kernel kernel-dkms
cd kernel-dkms
sed -i "s/__VERSION_STRING/${pkgver}/" dkms.conf
Deleted: kernel-5.1.patch
===================================================================
--- kernel-5.1.patch 2020-01-28 16:13:28 UTC (rev 374204)
+++ kernel-5.1.patch 2020-01-28 16:39:36 UTC (rev 374205)
@@ -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);
Deleted: kernel-5.2.patch
===================================================================
--- kernel-5.2.patch 2020-01-28 16:13:28 UTC (rev 374204)
+++ kernel-5.2.patch 2020-01-28 16:39:36 UTC (rev 374205)
@@ -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)
- {
Added: kernel-5.5.patch
===================================================================
--- kernel-5.5.patch (rev 0)
+++ kernel-5.5.patch 2020-01-28 16:39:36 UTC (rev 374205)
@@ -0,0 +1,395 @@
+diff --git a/.manifest b/.manifest
+index a53265d..bc46234 100644
+--- a/.manifest
++++ b/.manifest
+@@ -36,6 +36,7 @@ kernel/nvidia/nv-rsync.c 0644 KERNEL_MODULE_SRC INHERIT_PATH_DEPTH:1 MODULE:resm
+ kernel/nvidia/nv-report-err.c 0644 KERNEL_MODULE_SRC INHERIT_PATH_DEPTH:1 MODULE:resman
+ kernel/conftest.sh 0644 KERNEL_MODULE_SRC INHERIT_PATH_DEPTH:1 MODULE:resman
+ kernel/common/inc/nv.h 0644 KERNEL_MODULE_SRC INHERIT_PATH_DEPTH:1 MODULE:resman
++kernel/common/inc/nv-drm.h 0644 KERNEL_MODULE_SRC INHERIT_PATH_DEPTH:1 MODULE:resman
+ kernel/common/inc/nv-pgprot.h 0644 KERNEL_MODULE_SRC INHERIT_PATH_DEPTH:1 MODULE:resman
+ kernel/common/inc/nv-mm.h 0644 KERNEL_MODULE_SRC INHERIT_PATH_DEPTH:1 MODULE:resman
+ kernel/common/inc/nv-timer.h 0644 KERNEL_MODULE_SRC INHERIT_PATH_DEPTH:1 MODULE:resman
+diff --git a/kernel/common/inc/nv-drm.h b/kernel/common/inc/nv-drm.h
+new file mode 100644
+index 0000000..07e9f3c
+--- /dev/null
++++ b/kernel/common/inc/nv-drm.h
+@@ -0,0 +1,36 @@
++#ifndef _NV_DRM_H_
++#define _NV_DRM_H_
++
++#include "conftest.h"
++
++#if defined(NV_DRM_DRMP_H_PRESENT)
++#include <drm/drmP.h>
++#else
++#include <linux/agp_backend.h>
++#include <linux/file.h>
++#include <linux/init.h>
++#include <linux/jiffies.h>
++#include <linux/kernel.h>
++#include <linux/mutex.h>
++#include <linux/slab.h>
++#include <linux/types.h>
++#include <asm/pgalloc.h>
++#include <linux/uaccess.h>
++
++#include <uapi/drm/drm.h>
++#include <uapi/drm/drm_mode.h>
++
++#include <drm/drm_agpsupport.h>
++#include <drm/drm_crtc.h>
++#include <drm/drm_drv.h>
++#include <drm/drm_prime.h>
++#include <drm/drm_pci.h>
++#include <drm/drm_ioctl.h>
++#include <drm/drm_sysfs.h>
++#include <drm/drm_vblank.h>
++#include <drm/drm_device.h>
++
++#include <drm/drm_gem.h>
++#endif
++
++#endif
+diff --git a/kernel/conftest.sh b/kernel/conftest.sh
+index c9c2db3..dd22bb0 100755
+--- a/kernel/conftest.sh
++++ b/kernel/conftest.sh
+@@ -1150,6 +1150,9 @@ compile_test() {
+ CODE="
+ #if defined(NV_DRM_DRMP_H_PRESENT)
+ #include <drm/drmP.h>
++ #else
++ #include <drm/drm_drv.h>
++ #include <drm/drm_prime.h>
+ #endif
+ #if !defined(CONFIG_DRM) && !defined(CONFIG_DRM_MODULE)
+ #error DRM not enabled
+@@ -1781,6 +1784,8 @@ compile_test() {
+ echo "$CONFTEST_PREAMBLE
+ #if defined(NV_DRM_DRMP_H_PRESENT)
+ #include <drm/drmP.h>
++ #else
++ #include <drm/drm_drv.h>
+ #endif
+ #include <drm/drm_atomic.h>
+ #if !defined(CONFIG_DRM) && !defined(CONFIG_DRM_MODULE)
+@@ -1909,7 +1914,11 @@ compile_test() {
+ # attached drivers") in v3.14 (2013-12-11)
+ #
+ CODE="
++ #if defined(NV_DRM_DRMP_H_PRESENT)
+ #include <drm/drmP.h>
++ #else
++ #include <drm/drm_drv.h>
++ #endif
+ int conftest_drm_driver_has_legacy_dev_list(void) {
+ return offsetof(struct drm_driver, legacy_dev_list);
+ }"
+@@ -1933,7 +1942,11 @@ compile_test() {
+ # 2017-07-23 e6fc3b68558e4c6d8d160b5daf2511b99afa8814
+ #
+ CODE="
++ #if defined(NV_DRM_DRMP_H_PRESENT)
+ #include <drm/drmP.h>
++ #else
++ #include <drm/drm_crtc.h>
++ #endif
+
+ int conftest_drm_crtc_init_with_planes_has_name_arg(void) {
+ return
+@@ -1949,7 +1962,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 <drm/drmP.h>
++ #else
++ #include <drm/drm_encoder.h>
++ #endif
+
+ int conftest_drm_encoder_init_has_name_arg(void) {
+ return
+@@ -1964,7 +1981,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 <drm/drmP.h>
++ #else
++ #include <drm/drm_plane.h>
++ #endif
+
+ int conftest_drm_universal_plane_init_has_format_modifiers_arg(void) {
+ return
+@@ -1991,7 +2012,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 <drm/drmP.h>
++ #else
++ #include <drm/drm_plane.h>
++ #endif
+
+ int conftest_drm_universal_plane_init_has_name_arg(void) {
+ return
+@@ -3084,7 +3109,9 @@ compile_test() {
+ # drm_framebuffer_{get,put}()") in v4.12 (2017-02-28).
+ #
+ CODE="
++ #if defined(NV_DRM_DRMP_H_PRESENT)
+ #include <drm/drmP.h>
++ #endif
+ #if defined(NV_DRM_DRM_FRAMEBUFFER_H_PRESENT)
+ #include <drm/drm_framebuffer.h>
+ #endif
+@@ -3103,7 +3130,9 @@ compile_test() {
+ # drm_gem_object_{get,put}()") in v4.12 (2017-02-28).
+ #
+ CODE="
++ #if defined(NV_DRM_DRMP_H_PRESENT)
+ #include <drm/drmP.h>
++ #endif
+ #if defined(NV_DRM_DRM_GEM_H_PRESENT)
+ #include <drm/drm_gem.h>
+ #endif
+@@ -3122,7 +3151,9 @@ compile_test() {
+ # functions") in v4.15 (2017-09-26).
+ #
+ CODE="
++ #if defined(NV_DRM_DRMP_H_PRESENT)
+ #include <drm/drmP.h>
++ #endif
+ #if defined(NV_DRM_DRM_DRV_H_PRESENT)
+ #include <drm/drm_drv.h>
+ #endif
+diff --git a/kernel/nvidia-drm/nvidia-drm-connector.c b/kernel/nvidia-drm/nvidia-drm-connector.c
+index 1553ebc..f851561 100644
+--- a/kernel/nvidia-drm/nvidia-drm-connector.c
++++ b/kernel/nvidia-drm/nvidia-drm-connector.c
+@@ -20,6 +20,8 @@
+ * DEALINGS IN THE SOFTWARE.
+ */
+
++#include <linux/version.h>
++
+ #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_drm_connector_detect_internal(
+ 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_drm_connector_detect_internal(
+ 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_drm_connector_detect_internal(
+ 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_drm_connector_detect_internal(
+ }
+
+ detected_encoder = encoder;
++
++ break;
+ }
+ }
+
+diff --git a/kernel/nvidia-drm/nvidia-drm-connector.h b/kernel/nvidia-drm/nvidia-drm-connector.h
+index f74e22c..099390d 100644
+--- a/kernel/nvidia-drm/nvidia-drm-connector.h
++++ b/kernel/nvidia-drm/nvidia-drm-connector.h
+@@ -27,7 +27,7 @@
+
+ #if defined(NV_DRM_ATOMIC_MODESET_AVAILABLE)
+
+-#include <drm/drmP.h>
++#include "nv-drm.h"
+
+ #include "nvtypes.h"
+ #include "nvkms-api-types.h"
+diff --git a/kernel/nvidia-drm/nvidia-drm-crtc.h b/kernel/nvidia-drm/nvidia-drm-crtc.h
+index 31ef3b5..5de3a51 100644
+--- a/kernel/nvidia-drm/nvidia-drm-crtc.h
++++ b/kernel/nvidia-drm/nvidia-drm-crtc.h
+@@ -29,7 +29,7 @@
+
+ #include "nvidia-drm-helper.h"
+
+-#include <drm/drmP.h>
++#include "nv-drm.h"
+ #include "nvtypes.h"
+ #include "nvkms-kapi.h"
+
+diff --git a/kernel/nvidia-drm/nvidia-drm-drv.c b/kernel/nvidia-drm/nvidia-drm-drv.c
+index a66d3cc..06bf859 100644
+--- a/kernel/nvidia-drm/nvidia-drm-drv.c
++++ b/kernel/nvidia-drm/nvidia-drm-drv.c
+@@ -39,7 +39,7 @@
+
+ #include "nvidia-drm-ioctl.h"
+
+-#include <drm/drmP.h>
++#include "nv-drm.h"
+
+ /*
+ * Commit fcd70cd36b9b ("drm: Split out drm_probe_helper.h")
+diff --git a/kernel/nvidia-drm/nvidia-drm-encoder.h b/kernel/nvidia-drm/nvidia-drm-encoder.h
+index bbaf986..af341a8 100644
+--- a/kernel/nvidia-drm/nvidia-drm-encoder.h
++++ b/kernel/nvidia-drm/nvidia-drm-encoder.h
+@@ -32,7 +32,7 @@
+ #if defined(NV_DRM_DRM_ENCODER_H_PRESENT)
+ #include <drm/drm_encoder.h>
+ #else
+-#include <drm/drmP.h>
++#include "nv-drm.h"
+ #endif
+
+ #include "nvkms-kapi.h"
+diff --git a/kernel/nvidia-drm/nvidia-drm-fb.h b/kernel/nvidia-drm/nvidia-drm-fb.h
+index 7f292ce..d13bc4c 100644
+--- a/kernel/nvidia-drm/nvidia-drm-fb.h
++++ b/kernel/nvidia-drm/nvidia-drm-fb.h
+@@ -27,7 +27,7 @@
+
+ #if defined(NV_DRM_ATOMIC_MODESET_AVAILABLE)
+
+-#include <drm/drmP.h>
++#include "nv-drm.h"
+ #include "nvidia-drm-gem-nvkms-memory.h"
+ #include "nvkms-kapi.h"
+
+diff --git a/kernel/nvidia-drm/nvidia-drm-gem.h b/kernel/nvidia-drm/nvidia-drm-gem.h
+index b621969..326f810 100644
+--- a/kernel/nvidia-drm/nvidia-drm-gem.h
++++ b/kernel/nvidia-drm/nvidia-drm-gem.h
+@@ -29,7 +29,7 @@
+
+ #include "nvidia-drm-priv.h"
+
+-#include <drm/drmP.h>
++#include "nv-drm.h"
+ #include "nvkms-kapi.h"
+
+ #if defined(NV_DRM_DRIVER_HAS_GEM_PRIME_RES_OBJ)
+diff --git a/kernel/nvidia-drm/nvidia-drm-helper.c b/kernel/nvidia-drm/nvidia-drm-helper.c
+index da602ac..e5d6daa 100644
+--- a/kernel/nvidia-drm/nvidia-drm-helper.c
++++ b/kernel/nvidia-drm/nvidia-drm-helper.c
+@@ -31,7 +31,7 @@
+
+ #if defined(NV_DRM_ATOMIC_MODESET_AVAILABLE)
+
+-#include <drm/drmP.h>
++#include "nv-drm.h"
+ #if defined(NV_DRM_DRM_ATOMIC_UAPI_H_PRESENT)
+ #include <drm/drm_atomic_uapi.h>
+ #endif
+diff --git a/kernel/nvidia-drm/nvidia-drm-helper.h b/kernel/nvidia-drm/nvidia-drm-helper.h
+index 8f050d8..71c4b90 100644
+--- a/kernel/nvidia-drm/nvidia-drm-helper.h
++++ b/kernel/nvidia-drm/nvidia-drm-helper.h
+@@ -27,7 +27,7 @@
+
+ #if defined(NV_DRM_AVAILABLE)
+
+-#include <drm/drmP.h>
++#include "nv-drm.h"
+
+ /*
+ * drm_dev_put() is added by commit 9a96f55034e41b4e002b767e9218d55f03bdff7d
+diff --git a/kernel/nvidia-drm/nvidia-drm-modeset.h b/kernel/nvidia-drm/nvidia-drm-modeset.h
+index 06659c5..e9d7b70 100644
+--- a/kernel/nvidia-drm/nvidia-drm-modeset.h
++++ b/kernel/nvidia-drm/nvidia-drm-modeset.h
+@@ -27,7 +27,7 @@
+
+ #if defined(NV_DRM_ATOMIC_MODESET_AVAILABLE)
+
+-#include <drm/drmP.h>
++#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 --git a/kernel/nvidia-drm/nvidia-drm-os-interface.h b/kernel/nvidia-drm/nvidia-drm-os-interface.h
+index f43f851..7f4ff8b 100644
+--- a/kernel/nvidia-drm/nvidia-drm-os-interface.h
++++ b/kernel/nvidia-drm/nvidia-drm-os-interface.h
+@@ -29,7 +29,7 @@
+
+ #if defined(NV_DRM_AVAILABLE)
+
+-#include <drm/drmP.h>
++#include "nv-drm.h"
+
+ /* Set to true when the atomic modeset feature is enabled. */
+ extern bool nv_drm_modeset_module_param;
+diff --git a/kernel/nvidia-drm/nvidia-drm-prime-fence.h b/kernel/nvidia-drm/nvidia-drm-prime-fence.h
+index 20da923..f3cc2b4 100644
+--- a/kernel/nvidia-drm/nvidia-drm-prime-fence.h
++++ b/kernel/nvidia-drm/nvidia-drm-prime-fence.h
+@@ -27,7 +27,7 @@
+
+ #if defined(NV_DRM_AVAILABLE)
+
+-#include <drm/drmP.h>
++#include "nv-drm.h"
+
+ #if defined(NV_DRM_DRIVER_HAS_GEM_PRIME_RES_OBJ)
+
+diff --git a/kernel/nvidia-drm/nvidia-drm-priv.h b/kernel/nvidia-drm/nvidia-drm-priv.h
+index 9076835..77a95f3 100644
+--- a/kernel/nvidia-drm/nvidia-drm-priv.h
++++ b/kernel/nvidia-drm/nvidia-drm-priv.h
+@@ -27,7 +27,7 @@
+
+ #if defined(NV_DRM_AVAILABLE)
+
+-#include <drm/drmP.h>
++#include "nv-drm.h"
+
+ #if defined(NV_DRM_DRM_GEM_H_PRESENT)
+ #include <drm/drm_gem.h>
+diff --git a/kernel/nvidia-drm/nvidia-drm-utils.h b/kernel/nvidia-drm/nvidia-drm-utils.h
+index 6d24120..95190c4 100644
+--- a/kernel/nvidia-drm/nvidia-drm-utils.h
++++ b/kernel/nvidia-drm/nvidia-drm-utils.h
+@@ -27,7 +27,7 @@
+
+ #if defined(NV_DRM_ATOMIC_MODESET_AVAILABLE)
+
+-#include <drm/drmP.h>
++#include "nv-drm.h"
+ #include "nvkms-kapi.h"
+
+ struct NvKmsKapiConnectorInfo*
More information about the arch-commits
mailing list