diff options
author | Sven-Hendrik Haase | 2020-03-11 18:30:32 +0100 |
---|---|---|
committer | Sven-Hendrik Haase | 2020-03-11 18:30:32 +0100 |
commit | 1fdcd38b86c4597966b25f99d1751624fee214b0 (patch) | |
tree | 5906e47df391361be27907c9c40ca55966fd001a | |
download | aur-1fdcd38b86c4597966b25f99d1751624fee214b0.tar.gz |
Moved from [extra]
-rw-r--r-- | .SRCINFO | 36 | ||||
-rw-r--r-- | PKGBUILD | 90 | ||||
-rw-r--r-- | kernel-4.16.patch | 33 | ||||
-rw-r--r-- | kernel-5.5.patch | 395 |
4 files changed, 554 insertions, 0 deletions
diff --git a/.SRCINFO b/.SRCINFO new file mode 100644 index 000000000000..142f8301be77 --- /dev/null +++ b/.SRCINFO @@ -0,0 +1,36 @@ +pkgbase = nvidia-390xx + pkgdesc = NVIDIA drivers for linux, 390xx legacy branch + pkgver = 390.132 + pkgrel = 32 + url = https://www.nvidia.com/ + arch = x86_64 + license = custom + makedepends = nvidia-390xx-utils=390.132 + makedepends = libglvnd + makedepends = linux-headers + conflicts = nvidia + options = !strip + source = https://us.download.nvidia.com/XFree86/Linux-x86_64/390.132/NVIDIA-Linux-x86_64-390.132-no-compat32.run + source = kernel-4.16.patch + source = kernel-5.5.patch + sha256sums = b6b4b8af37e78e026c9ebdf4a5c64ea412dfcb710931dd028c22dac228de659d + sha256sums = 622ac792ec200b2239cb663c0010392118b78c9904973d82cd261165c16d6385 + sha256sums = 93efb4bd03c9617d6030dd4966d7350ec7a4e09f71e0566586454f5366385fff + +pkgname = nvidia-390xx + pkgdesc = NVIDIA drivers for linux, 390xx legacy branch + depends = linux + depends = nvidia-390xx-utils=390.132 + depends = libglvnd + +pkgname = nvidia-390xx-dkms + pkgdesc = NVIDIA driver sources for linux, 390xx legacy branch + depends = dkms + depends = nvidia-390xx-utils=390.132 + depends = libglvnd + optdepends = linux-headers: Build the module for Arch kernel + optdepends = linux-lts-headers: Build the module for LTS Arch kernel + provides = nvidia-390xx=390.132 + conflicts = nvidia + conflicts = nvidia-390xx + diff --git a/PKGBUILD b/PKGBUILD new file mode 100644 index 000000000000..a8f586aa6938 --- /dev/null +++ b/PKGBUILD @@ -0,0 +1,90 @@ +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> +# Maintainer: Felix Yan <felixonmars@archlinux.org> +# Contributor: Thomas Baechler <thomas@archlinux.org> + +pkgbase=nvidia-390xx +pkgname=(nvidia-390xx nvidia-390xx-dkms) +pkgver=390.132 +pkgrel=32 +pkgdesc="NVIDIA drivers for linux, 390xx legacy branch" +arch=('x86_64') +url="https://www.nvidia.com/" +makedepends=("nvidia-390xx-utils=${pkgver}" 'libglvnd' 'linux-headers') +conflicts=('nvidia') +license=('custom') +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-5.5.patch') +sha256sums=('b6b4b8af37e78e026c9ebdf4a5c64ea412dfcb710931dd028c22dac228de659d' + '622ac792ec200b2239cb663c0010392118b78c9904973d82cd261165c16d6385' + '93efb4bd03c9617d6030dd4966d7350ec7a4e09f71e0566586454f5366385fff') + +prepare() { + sh "${_pkg}.run" --extract-only + cd "${_pkg}" + + # Restore phys_to_dma support (still needed for 396.18) + # 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 + sed -i 's/__JOBS/`nproc`/' dkms.conf + sed -i 's/__DKMS_MODULES//' dkms.conf + sed -i '$iBUILT_MODULE_NAME[0]="nvidia"\ +DEST_MODULE_LOCATION[0]="/kernel/drivers/video"\ +BUILT_MODULE_NAME[1]="nvidia-uvm"\ +DEST_MODULE_LOCATION[1]="/kernel/drivers/video"\ +BUILT_MODULE_NAME[2]="nvidia-modeset"\ +DEST_MODULE_LOCATION[2]="/kernel/drivers/video"\ +BUILT_MODULE_NAME[3]="nvidia-drm"\ +DEST_MODULE_LOCATION[3]="/kernel/drivers/video"' dkms.conf + + # Gift for linux-rt guys + sed -i 's/NV_EXCLUDE_BUILD_MODULES/IGNORE_PREEMPT_RT_PRESENCE=1 NV_EXCLUDE_BUILD_MODULES/' dkms.conf +} + +build() { + cd "${_pkg}"/kernel + make SYSSRC=/usr/src/linux module +} + +package_nvidia-390xx() { + pkgdesc="NVIDIA drivers for linux, 390xx legacy branch" + depends=('linux' "nvidia-390xx-utils=${pkgver}" 'libglvnd') + + _extradir="/usr/lib/modules/$(</usr/src/linux/version)/extramodules" + install -Dt "${pkgdir}${_extradir}" -m644 \ + "${srcdir}/${_pkg}/kernel"/nvidia{,-modeset,-drm,-uvm}.ko + + find "${pkgdir}" -name '*.ko' -exec gzip -n {} + + + echo "blacklist nouveau" | + install -Dm644 /dev/stdin "${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf" + + install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 "${srcdir}/${_pkg}/LICENSE" +} + +package_nvidia-390xx-dkms() { + pkgdesc="NVIDIA driver sources for linux, 390xx legacy branch" + depends=('dkms' "nvidia-390xx-utils=$pkgver" 'libglvnd') + optdepends=('linux-headers: Build the module for Arch kernel' + 'linux-lts-headers: Build the module for LTS Arch kernel') + provides=("nvidia-390xx=$pkgver") + conflicts+=('nvidia-390xx') + + cd ${_pkg} + + install -dm 755 "${pkgdir}"/usr/src + cp -dr --no-preserve='ownership' kernel-dkms "${pkgdir}/usr/src/nvidia-${pkgver}" + + echo "blacklist nouveau" | + install -Dm644 /dev/stdin "${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf" + + install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 "${srcdir}/${_pkg}/LICENSE" +} diff --git a/kernel-4.16.patch b/kernel-4.16.patch new file mode 100644 index 000000000000..67172815ff69 --- /dev/null +++ b/kernel-4.16.patch @@ -0,0 +1,33 @@ +diff --git a/kernel/common/inc/nv-linux.h b/kernel/common/inc/nv-linux.h +index 10fc418..22ef968 100644 +--- a/kernel/common/inc/nv-linux.h ++++ b/kernel/common/inc/nv-linux.h +@@ -175,7 +175,11 @@ static inline uid_t __kuid_val(kuid_t uid) + + #if defined(NV_VM_INSERT_PAGE_PRESENT) + #include <linux/pagemap.h> ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0) + #include <linux/dma-mapping.h> ++#else ++#include <linux/dma-direct.h> ++#endif + #endif + + #if defined(CONFIG_SWIOTLB) && defined(NVCPU_AARCH64) +diff --git a/kernel/conftest.sh b/kernel/conftest.sh +index b23dbb4..42dc576 100755 +--- a/kernel/conftest.sh ++++ b/kernel/conftest.sh +@@ -1906,7 +1906,12 @@ compile_test() { + # Determine if the phys_to_dma function is present. + # + CODE=" ++ #include <linux/version.h> ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0) + #include <linux/dma-mapping.h> ++#else ++ #include <linux/dma-direct.h> ++#endif + void conftest_phys_to_dma(void) { + phys_to_dma(); + }" diff --git a/kernel-5.5.patch b/kernel-5.5.patch new file mode 100644 index 000000000000..bda326c0d2d2 --- /dev/null +++ b/kernel-5.5.patch @@ -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* |