From 18e69d251b7fd3e19adc8a1dabd883641c585455 Mon Sep 17 00:00:00 2001 From: Tk-Glitch Date: Mon, 18 Dec 2019 14:11:36 +0100 Subject: Updated 5.5 patch, from Isaak I. Aleksandrov - https://gitlab.com/snippets/1923197 diff --git a/kernel-dkms/common/inc/nv-drm.h b/kernel-dkms/common/inc/nv-drm.h new file mode 100644 index 0000000..07e9f3c --- /dev/null +++ b/kernel-dkms/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 +#else +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#endif + +#endif diff --git a/kernel-dkms/conftest.sh b/kernel-dkms/conftest.sh index c9c2db3..dd22bb0 100755 --- a/kernel-dkms/conftest.sh +++ b/kernel-dkms/conftest.sh @@ -1150,6 +1150,9 @@ compile_test() { CODE=" #if defined(NV_DRM_DRMP_H_PRESENT) #include + #else + #include + #include #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 + #else + #include #endif #include #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 + #else + #include + #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 + #else + #include + #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 + #else + #include + #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 + #else + #include + #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 + #else + #include + #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 + #endif #if defined(NV_DRM_DRM_FRAMEBUFFER_H_PRESENT) #include #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 + #endif #if defined(NV_DRM_DRM_GEM_H_PRESENT) #include #endif @@ -3122,7 +3151,9 @@ compile_test() { # functions") in v4.15 (2017-09-26). # CODE=" + #if defined(NV_DRM_DRMP_H_PRESENT) #include + #endif #if defined(NV_DRM_DRM_DRV_H_PRESENT) #include #endif diff --git a/kernel-dkms/nvidia-drm/nvidia-drm-connector.c b/kernel-dkms/nvidia-drm/nvidia-drm-connector.c index 1553ebc..f851561 100644 --- a/kernel-dkms/nvidia-drm/nvidia-drm-connector.c +++ b/kernel-dkms/nvidia-drm/nvidia-drm-connector.c @@ -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-dkms/nvidia-drm/nvidia-drm-connector.h b/kernel-dkms/nvidia-drm/nvidia-drm-connector.h index f74e22c..099390d 100644 --- a/kernel-dkms/nvidia-drm/nvidia-drm-connector.h +++ b/kernel-dkms/nvidia-drm/nvidia-drm-connector.h @@ -27,7 +27,7 @@ #if defined(NV_DRM_ATOMIC_MODESET_AVAILABLE) -#include +#include "nv-drm.h" #include "nvtypes.h" #include "nvkms-api-types.h" diff --git a/kernel-dkms/nvidia-drm/nvidia-drm-crtc.h b/kernel-dkms/nvidia-drm/nvidia-drm-crtc.h index 31ef3b5..5de3a51 100644 --- a/kernel-dkms/nvidia-drm/nvidia-drm-crtc.h +++ b/kernel-dkms/nvidia-drm/nvidia-drm-crtc.h @@ -29,7 +29,7 @@ #include "nvidia-drm-helper.h" -#include +#include "nv-drm.h" #include "nvtypes.h" #include "nvkms-kapi.h" diff --git a/kernel-dkms/nvidia-drm/nvidia-drm-drv.c b/kernel-dkms/nvidia-drm/nvidia-drm-drv.c index a66d3cc..06bf859 100644 --- a/kernel-dkms/nvidia-drm/nvidia-drm-drv.c +++ b/kernel-dkms/nvidia-drm/nvidia-drm-drv.c @@ -39,7 +39,7 @@ #include "nvidia-drm-ioctl.h" -#include +#include "nv-drm.h" /* * Commit fcd70cd36b9b ("drm: Split out drm_probe_helper.h") diff --git a/kernel-dkms/nvidia-drm/nvidia-drm-encoder.h b/kernel-dkms/nvidia-drm/nvidia-drm-encoder.h index bbaf986..af341a8 100644 --- a/kernel-dkms/nvidia-drm/nvidia-drm-encoder.h +++ b/kernel-dkms/nvidia-drm/nvidia-drm-encoder.h @@ -32,7 +32,7 @@ #if defined(NV_DRM_DRM_ENCODER_H_PRESENT) #include #else -#include +#include "nv-drm.h" #endif #include "nvkms-kapi.h" diff --git a/kernel-dkms/nvidia-drm/nvidia-drm-fb.h b/kernel-dkms/nvidia-drm/nvidia-drm-fb.h index 7f292ce..d13bc4c 100644 --- a/kernel-dkms/nvidia-drm/nvidia-drm-fb.h +++ b/kernel-dkms/nvidia-drm/nvidia-drm-fb.h @@ -27,7 +27,7 @@ #if defined(NV_DRM_ATOMIC_MODESET_AVAILABLE) -#include +#include "nv-drm.h" #include "nvidia-drm-gem-nvkms-memory.h" #include "nvkms-kapi.h" diff --git a/kernel-dkms/nvidia-drm/nvidia-drm-gem.h b/kernel-dkms/nvidia-drm/nvidia-drm-gem.h index b621969..326f810 100644 --- a/kernel-dkms/nvidia-drm/nvidia-drm-gem.h +++ b/kernel-dkms/nvidia-drm/nvidia-drm-gem.h @@ -29,7 +29,7 @@ #include "nvidia-drm-priv.h" -#include +#include "nv-drm.h" #include "nvkms-kapi.h" #if defined(NV_DRM_DRIVER_HAS_GEM_PRIME_RES_OBJ) diff --git a/kernel-dkms/nvidia-drm/nvidia-drm-helper.c b/kernel-dkms/nvidia-drm/nvidia-drm-helper.c index da602ac..e5d6daa 100644 --- a/kernel-dkms/nvidia-drm/nvidia-drm-helper.c +++ b/kernel-dkms/nvidia-drm/nvidia-drm-helper.c @@ -31,7 +31,7 @@ #if defined(NV_DRM_ATOMIC_MODESET_AVAILABLE) -#include +#include "nv-drm.h" #if defined(NV_DRM_DRM_ATOMIC_UAPI_H_PRESENT) #include #endif diff --git a/kernel-dkms/nvidia-drm/nvidia-drm-helper.h b/kernel-dkms/nvidia-drm/nvidia-drm-helper.h index 8f050d8..71c4b90 100644 --- a/kernel-dkms/nvidia-drm/nvidia-drm-helper.h +++ b/kernel-dkms/nvidia-drm/nvidia-drm-helper.h @@ -27,7 +27,7 @@ #if defined(NV_DRM_AVAILABLE) -#include +#include "nv-drm.h" /* * drm_dev_put() is added by commit 9a96f55034e41b4e002b767e9218d55f03bdff7d diff --git a/kernel-dkms/nvidia-drm/nvidia-drm-modeset.h b/kernel-dkms/nvidia-drm/nvidia-drm-modeset.h index 06659c5..e9d7b70 100644 --- a/kernel-dkms/nvidia-drm/nvidia-drm-modeset.h +++ b/kernel-dkms/nvidia-drm/nvidia-drm-modeset.h @@ -27,7 +27,7 @@ #if defined(NV_DRM_ATOMIC_MODESET_AVAILABLE) -#include +#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-dkms/nvidia-drm/nvidia-drm-os-interface.h b/kernel-dkms/nvidia-drm/nvidia-drm-os-interface.h index f43f851..7f4ff8b 100644 --- a/kernel-dkms/nvidia-drm/nvidia-drm-os-interface.h +++ b/kernel-dkms/nvidia-drm/nvidia-drm-os-interface.h @@ -29,7 +29,7 @@ #if defined(NV_DRM_AVAILABLE) -#include +#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-dkms/nvidia-drm/nvidia-drm-prime-fence.h b/kernel-dkms/nvidia-drm/nvidia-drm-prime-fence.h index 20da923..f3cc2b4 100644 --- a/kernel-dkms/nvidia-drm/nvidia-drm-prime-fence.h +++ b/kernel-dkms/nvidia-drm/nvidia-drm-prime-fence.h @@ -27,7 +27,7 @@ #if defined(NV_DRM_AVAILABLE) -#include +#include "nv-drm.h" #if defined(NV_DRM_DRIVER_HAS_GEM_PRIME_RES_OBJ) diff --git a/kernel-dkms/nvidia-drm/nvidia-drm-priv.h b/kernel-dkms/nvidia-drm/nvidia-drm-priv.h index 9076835..77a95f3 100644 --- a/kernel-dkms/nvidia-drm/nvidia-drm-priv.h +++ b/kernel-dkms/nvidia-drm/nvidia-drm-priv.h @@ -27,7 +27,7 @@ #if defined(NV_DRM_AVAILABLE) -#include +#include "nv-drm.h" #if defined(NV_DRM_DRM_GEM_H_PRESENT) #include diff --git a/kernel-dkms/nvidia-drm/nvidia-drm-utils.h b/kernel-dkms/nvidia-drm/nvidia-drm-utils.h index 6d24120..95190c4 100644 --- a/kernel-dkms/nvidia-drm/nvidia-drm-utils.h +++ b/kernel-dkms/nvidia-drm/nvidia-drm-utils.h @@ -27,7 +27,7 @@ #if defined(NV_DRM_ATOMIC_MODESET_AVAILABLE) -#include +#include "nv-drm.h" #include "nvkms-kapi.h" struct NvKmsKapiConnectorInfo*