.manifest | 1 + kernel/common/inc/nv-drm.h | 36 ++++++++++++++++++++++++++++++++++++ kernel/conftest.sh | 31 +++++++++++++++++++++++++++++++ kernel/nvidia-drm/nvidia-drm-connector.c | 14 ++++++++++++++ kernel/nvidia-drm/nvidia-drm-connector.h | 2 +- kernel/nvidia-drm/nvidia-drm-crtc.h | 2 +- kernel/nvidia-drm/nvidia-drm-drv.c | 2 +- kernel/nvidia-drm/nvidia-drm-encoder.h | 2 +- kernel/nvidia-drm/nvidia-drm-fb.h | 2 +- kernel/nvidia-drm/nvidia-drm-gem.h | 2 +- kernel/nvidia-drm/nvidia-drm-helper.c | 2 +- kernel/nvidia-drm/nvidia-drm-helper.h | 2 +- kernel/nvidia-drm/nvidia-drm-modeset.h | 2 +- kernel/nvidia-drm/nvidia-drm-os-interface.h | 2 +- kernel/nvidia-drm/nvidia-drm-prime-fence.h | 2 +- kernel/nvidia-drm/nvidia-drm-priv.h | 2 +- kernel/nvidia-drm/nvidia-drm-utils.h | 2 +- 17 files changed, 95 insertions(+), 13 deletions(-) diff -Nurp NVIDIA-Linux-x86_64-390.132.orig/kernel/common/inc/nv-drm.h NVIDIA-Linux-x86_64-390.132/kernel/common/inc/nv-drm.h --- NVIDIA-Linux-x86_64-390.132.orig/kernel/common/inc/nv-drm.h 1970-01-01 02:00:00.000000000 +0200 +++ NVIDIA-Linux-x86_64-390.132/kernel/common/inc/nv-drm.h 2020-02-09 22:37:55.798547949 +0200 @@ -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 -Nurp NVIDIA-Linux-x86_64-390.132.orig/kernel/conftest.sh NVIDIA-Linux-x86_64-390.132/kernel/conftest.sh --- NVIDIA-Linux-x86_64-390.132.orig/kernel/conftest.sh 2019-11-01 11:39:53.000000000 +0200 +++ NVIDIA-Linux-x86_64-390.132/kernel/conftest.sh 2020-02-09 22:37:55.799547995 +0200 @@ -1678,6 +1678,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 @@ -2266,6 +2269,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) @@ -2384,7 +2389,11 @@ compile_test() { # 2013-12-11 b3f2333de8e81b089262b26d52272911523e605f # 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); }" @@ -2408,7 +2417,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 @@ -2424,7 +2437,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 @@ -2439,7 +2456,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 @@ -2466,7 +2487,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 @@ -3605,7 +3630,9 @@ compile_test() { # Introduce drm_framebuffer_{get,put}()) on 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 @@ -3624,7 +3651,9 @@ compile_test() { # Introduce drm_gem_object_{get,put}()) on 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 @@ -3643,7 +3672,9 @@ compile_test() { # introduce drm_dev_{get/put} functions) on 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 -Nurp NVIDIA-Linux-x86_64-390.132.orig/kernel/nvidia-drm/nvidia-drm-connector.c NVIDIA-Linux-x86_64-390.132/kernel/nvidia-drm/nvidia-drm-connector.c --- NVIDIA-Linux-x86_64-390.132.orig/kernel/nvidia-drm/nvidia-drm-connector.c 2019-11-01 14:37:55.000000000 +0200 +++ NVIDIA-Linux-x86_64-390.132/kernel/nvidia-drm/nvidia-drm-connector.c 2020-02-09 22:37:55.799547995 +0200 @@ -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_dr 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_dr 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_dr 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_dr } detected_encoder = encoder; + + break; } } diff -Nurp NVIDIA-Linux-x86_64-390.132.orig/kernel/nvidia-drm/nvidia-drm-connector.h NVIDIA-Linux-x86_64-390.132/kernel/nvidia-drm/nvidia-drm-connector.h --- NVIDIA-Linux-x86_64-390.132.orig/kernel/nvidia-drm/nvidia-drm-connector.h 2019-11-01 14:37:54.000000000 +0200 +++ NVIDIA-Linux-x86_64-390.132/kernel/nvidia-drm/nvidia-drm-connector.h 2020-02-09 22:37:55.799547995 +0200 @@ -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 -Nurp NVIDIA-Linux-x86_64-390.132.orig/kernel/nvidia-drm/nvidia-drm-crtc.h NVIDIA-Linux-x86_64-390.132/kernel/nvidia-drm/nvidia-drm-crtc.h --- NVIDIA-Linux-x86_64-390.132.orig/kernel/nvidia-drm/nvidia-drm-crtc.h 2019-11-01 14:37:54.000000000 +0200 +++ NVIDIA-Linux-x86_64-390.132/kernel/nvidia-drm/nvidia-drm-crtc.h 2020-02-09 22:37:55.799547995 +0200 @@ -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 -Nurp NVIDIA-Linux-x86_64-390.132.orig/kernel/nvidia-drm/nvidia-drm-drv.c NVIDIA-Linux-x86_64-390.132/kernel/nvidia-drm/nvidia-drm-drv.c --- NVIDIA-Linux-x86_64-390.132.orig/kernel/nvidia-drm/nvidia-drm-drv.c 2019-11-01 14:37:54.000000000 +0200 +++ NVIDIA-Linux-x86_64-390.132/kernel/nvidia-drm/nvidia-drm-drv.c 2020-02-09 22:37:55.799547995 +0200 @@ -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 -Nurp NVIDIA-Linux-x86_64-390.132.orig/kernel/nvidia-drm/nvidia-drm-encoder.h NVIDIA-Linux-x86_64-390.132/kernel/nvidia-drm/nvidia-drm-encoder.h --- NVIDIA-Linux-x86_64-390.132.orig/kernel/nvidia-drm/nvidia-drm-encoder.h 2019-11-01 14:37:54.000000000 +0200 +++ NVIDIA-Linux-x86_64-390.132/kernel/nvidia-drm/nvidia-drm-encoder.h 2020-02-09 22:37:55.799547995 +0200 @@ -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 -Nurp NVIDIA-Linux-x86_64-390.132.orig/kernel/nvidia-drm/nvidia-drm-fb.h NVIDIA-Linux-x86_64-390.132/kernel/nvidia-drm/nvidia-drm-fb.h --- NVIDIA-Linux-x86_64-390.132.orig/kernel/nvidia-drm/nvidia-drm-fb.h 2019-11-01 14:37:54.000000000 +0200 +++ NVIDIA-Linux-x86_64-390.132/kernel/nvidia-drm/nvidia-drm-fb.h 2020-02-09 22:37:55.799547995 +0200 @@ -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 -Nurp NVIDIA-Linux-x86_64-390.132.orig/kernel/nvidia-drm/nvidia-drm-gem.h NVIDIA-Linux-x86_64-390.132/kernel/nvidia-drm/nvidia-drm-gem.h --- NVIDIA-Linux-x86_64-390.132.orig/kernel/nvidia-drm/nvidia-drm-gem.h 2019-11-01 14:37:54.000000000 +0200 +++ NVIDIA-Linux-x86_64-390.132/kernel/nvidia-drm/nvidia-drm-gem.h 2020-02-09 22:37:55.799547995 +0200 @@ -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 -Nurp NVIDIA-Linux-x86_64-390.132.orig/kernel/nvidia-drm/nvidia-drm-helper.c NVIDIA-Linux-x86_64-390.132/kernel/nvidia-drm/nvidia-drm-helper.c --- NVIDIA-Linux-x86_64-390.132.orig/kernel/nvidia-drm/nvidia-drm-helper.c 2019-11-01 14:37:54.000000000 +0200 +++ NVIDIA-Linux-x86_64-390.132/kernel/nvidia-drm/nvidia-drm-helper.c 2020-02-09 22:37:55.799547995 +0200 @@ -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 -Nurp NVIDIA-Linux-x86_64-390.132.orig/kernel/nvidia-drm/nvidia-drm-helper.h NVIDIA-Linux-x86_64-390.132/kernel/nvidia-drm/nvidia-drm-helper.h --- NVIDIA-Linux-x86_64-390.132.orig/kernel/nvidia-drm/nvidia-drm-helper.h 2019-11-01 14:37:54.000000000 +0200 +++ NVIDIA-Linux-x86_64-390.132/kernel/nvidia-drm/nvidia-drm-helper.h 2020-02-09 22:37:55.799547995 +0200 @@ -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 -Nurp NVIDIA-Linux-x86_64-390.132.orig/kernel/nvidia-drm/nvidia-drm-modeset.h NVIDIA-Linux-x86_64-390.132/kernel/nvidia-drm/nvidia-drm-modeset.h --- NVIDIA-Linux-x86_64-390.132.orig/kernel/nvidia-drm/nvidia-drm-modeset.h 2019-11-01 14:37:54.000000000 +0200 +++ NVIDIA-Linux-x86_64-390.132/kernel/nvidia-drm/nvidia-drm-modeset.h 2020-02-09 22:37:55.799547995 +0200 @@ -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 -Nurp NVIDIA-Linux-x86_64-390.132.orig/kernel/nvidia-drm/nvidia-drm-os-interface.h NVIDIA-Linux-x86_64-390.132/kernel/nvidia-drm/nvidia-drm-os-interface.h --- NVIDIA-Linux-x86_64-390.132.orig/kernel/nvidia-drm/nvidia-drm-os-interface.h 2019-11-01 14:37:54.000000000 +0200 +++ NVIDIA-Linux-x86_64-390.132/kernel/nvidia-drm/nvidia-drm-os-interface.h 2020-02-09 22:37:55.799547995 +0200 @@ -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 -Nurp NVIDIA-Linux-x86_64-390.132.orig/kernel/nvidia-drm/nvidia-drm-prime-fence.h NVIDIA-Linux-x86_64-390.132/kernel/nvidia-drm/nvidia-drm-prime-fence.h --- NVIDIA-Linux-x86_64-390.132.orig/kernel/nvidia-drm/nvidia-drm-prime-fence.h 2019-11-01 14:37:54.000000000 +0200 +++ NVIDIA-Linux-x86_64-390.132/kernel/nvidia-drm/nvidia-drm-prime-fence.h 2020-02-09 22:37:55.799547995 +0200 @@ -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 -Nurp NVIDIA-Linux-x86_64-390.132.orig/kernel/nvidia-drm/nvidia-drm-priv.h NVIDIA-Linux-x86_64-390.132/kernel/nvidia-drm/nvidia-drm-priv.h --- NVIDIA-Linux-x86_64-390.132.orig/kernel/nvidia-drm/nvidia-drm-priv.h 2019-11-01 14:37:54.000000000 +0200 +++ NVIDIA-Linux-x86_64-390.132/kernel/nvidia-drm/nvidia-drm-priv.h 2020-02-09 22:37:55.799547995 +0200 @@ -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 -Nurp NVIDIA-Linux-x86_64-390.132.orig/kernel/nvidia-drm/nvidia-drm-utils.h NVIDIA-Linux-x86_64-390.132/kernel/nvidia-drm/nvidia-drm-utils.h --- NVIDIA-Linux-x86_64-390.132.orig/kernel/nvidia-drm/nvidia-drm-utils.h 2019-11-01 14:37:54.000000000 +0200 +++ NVIDIA-Linux-x86_64-390.132/kernel/nvidia-drm/nvidia-drm-utils.h 2020-02-09 22:37:55.799547995 +0200 @@ -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* diff -Nurp NVIDIA-Linux-x86_64-390.132.orig/.manifest NVIDIA-Linux-x86_64-390.132/.manifest --- NVIDIA-Linux-x86_64-390.132.orig/.manifest 2019-11-01 10:31:50.000000000 +0200 +++ NVIDIA-Linux-x86_64-390.132/.manifest 2020-02-09 22:37:55.798547949 +0200 @@ -37,6 +37,7 @@ kernel/nvidia/nv-ibmnpu.c 0644 KERNEL_MO 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