You are not logged in.
- Topics: Active | Unanswered
Pages: 1
#1 2020-01-28 06:04:05
- Roken
- Member
- From: South Wales, UK
- Registered: 2012-01-16
- Posts: 1,359
[SOLVED] Linux 5.5 breaks NVidia
Linux 5.5 removes drm from the kernel, which NVidia needs to build.
https://github.com/torvalds/linux/commi … d7af2a0374
and
https://devtalk.nvidia.com/default/topi … te-kernel/
Last edited by Roken (2020-01-28 19:59:02)
Ryzen 5900X 12 core/24 thread - RTX 3090 FE 24 Gb, Asus B550-F Gaming MB, 128Gb Corsair DDR4, Fractal Design Define 7 XL, 5 HD (2 NvME PCI, 4SSD) + 1 x optical.
Linux user #545703
/ is the root of all problems.
Offline
#2 2020-01-28 06:21:19
- loqs
- Member
- Registered: 2014-03-06
- Posts: 18,928
Re: [SOLVED] Linux 5.5 breaks NVidia
Try this patch
diff --git a/kernel/conftest.sh b/kernel/conftest.sh
index 8c4c9d8..a16639a 100755
--- a/kernel/conftest.sh
+++ b/kernel/conftest.sh
@@ -1107,6 +1107,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
@@ -1871,7 +1874,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);
}"
@@ -1895,7 +1902,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
@@ -1911,7 +1922,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
@@ -1926,7 +1941,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
@@ -1953,7 +1972,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
@@ -2006,7 +2029,11 @@ compile_test() {
# callback") in v3.18 (2014-08-29)
#
CODE="
+ #if defined(NV_DRM_DRMP_H_PRESENT)
#include <drm/drmP.h>
+ #else
+ #include <drm/drm_drv.h>
+ #endif
int conftest_drm_driver_has_set_busid(void) {
return offsetof(struct drm_driver, set_busid);
}"
@@ -2023,7 +2050,11 @@ compile_test() {
# objects") in v3.17 (2014-07-01)
#
CODE="
+ #if defined(NV_DRM_DRMP_H_PRESENT)
#include <drm/drmP.h>
+ #else
+ #include <drm/drm_drv.h
+ #endif
int conftest_drm_driver_has_gem_prime_res_obj(void) {
return offsetof(struct drm_driver, gem_prime_res_obj);
}"
@@ -2516,7 +2547,11 @@ compile_test() {
# in v4.8 (2016-06-21)
#
CODE="
+ #if defined(NV_DRM_DRMP_H_PRESENT)
#include <drm/drmP.h>
+ #else
+ #include <drm/drm_drv.h>
+ #endif
void conftest_drm_master_drop_has_from_release_arg(struct drm_driver *drv) {
drv->master_drop(NULL, NULL, false);
}"
@@ -2650,7 +2685,11 @@ compile_test() {
# type of the unload hook to void") in v4.11 (2017-01-06)
#
CODE="
+ #if defined(NV_DRM_DRMP_H_PRESENT)
#include <drm/drmP.h>
+ #else
+ #include <drm/drm_drv.h>
+ #endif
int conftest_drm_driver_unload_has_int_return_type(struct drm_driver *drv) {
return drv->unload(NULL /* dev */);
@@ -3032,7 +3071,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
@@ -3051,7 +3092,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
@@ -3070,7 +3113,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
@@ -3342,7 +3387,9 @@ compile_test() {
# (2019-01-29).
#
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..f50da56 100644
--- a/kernel/nvidia-drm/nvidia-drm-connector.c
+++ b/kernel/nvidia-drm/nvidia-drm-connector.c
@@ -67,11 +67,11 @@ static enum drm_connector_status __nv_drm_connector_detect_internal(
enum drm_connector_status status = connector_status_disconnected;
+ struct drm_encoder *encoder;
struct drm_encoder *detected_encoder = NULL;
struct nv_drm_encoder *nv_detected_encoder = NULL;
struct NvKmsKapiDynamicDisplayParams *pDetectParams = NULL;
- unsigned int i;
BUG_ON(!mutex_is_locked(&dev->mode_config.mutex));
@@ -87,22 +87,9 @@ static enum drm_connector_status __nv_drm_connector_detect_internal(
goto done;
}
- for (i = 0;
- i < DRM_CONNECTOR_MAX_ENCODER && detected_encoder == NULL; i++) {
- struct drm_encoder *encoder;
+ drm_connector_for_each_possible_encoder(connector, encoder) {
struct nv_drm_encoder *nv_encoder;
- if (connector->encoder_ids[i] == 0) {
- break;
- }
-
- encoder = nv_drm_encoder_find(dev, connector->encoder_ids[i]);
-
- if (encoder == NULL) {
- BUG_ON(encoder != NULL);
- continue;
- }
-
/*
* DVI-I connectors can drive both digital and analog
* encoders. If a digital connection has been forced then
diff --git a/kernel/nvidia-drm/nvidia-drm-connector.h b/kernel/nvidia-drm/nvidia-drm-connector.h
index f74e22c..25c21b0 100644
--- a/kernel/nvidia-drm/nvidia-drm-connector.h
+++ b/kernel/nvidia-drm/nvidia-drm-connector.h
@@ -27,7 +27,11 @@
#if defined(NV_DRM_ATOMIC_MODESET_AVAILABLE)
+#if defined(NV_DRM_DRMP_H_PRESENT)
#include <drm/drmP.h>
+#else
+#include <drm/drm_connector.h>
+#endif
#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..6ac2283 100644
--- a/kernel/nvidia-drm/nvidia-drm-crtc.h
+++ b/kernel/nvidia-drm/nvidia-drm-crtc.h
@@ -29,7 +29,11 @@
#include "nvidia-drm-helper.h"
+#if defined(NV_DRM_DRMP_H_PRESENT)
#include <drm/drmP.h>
+#else
+#include <drm/drm_crtc.h>
+#endif
#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..d2973b2 100644
--- a/kernel/nvidia-drm/nvidia-drm-drv.c
+++ b/kernel/nvidia-drm/nvidia-drm-drv.c
@@ -39,7 +39,13 @@
#include "nvidia-drm-ioctl.h"
+#if defined(NV_DRM_DRMP_H_PRESENT)
#include <drm/drmP.h>
+#else
+#include <drm/drm_vblank.h>
+#include <drm/drm_ioctl.h>
+#include <linux/pci.h>
+#endif
/*
* Commit fcd70cd36b9b ("drm: Split out drm_probe_helper.h")
diff --git a/kernel/nvidia-drm/nvidia-drm-fb.h b/kernel/nvidia-drm/nvidia-drm-fb.h
index 7f292ce..95d5ebf 100644
--- a/kernel/nvidia-drm/nvidia-drm-fb.h
+++ b/kernel/nvidia-drm/nvidia-drm-fb.h
@@ -27,7 +27,11 @@
#if defined(NV_DRM_ATOMIC_MODESET_AVAILABLE)
+#if defined(NV_DRM_DRMP_H_PRESENT)
#include <drm/drmP.h>
+#else
+#include <drm/drm_crtc.h>
+#endif
#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..9949acb 100644
--- a/kernel/nvidia-drm/nvidia-drm-gem.h
+++ b/kernel/nvidia-drm/nvidia-drm-gem.h
@@ -29,7 +29,11 @@
#include "nvidia-drm-priv.h"
+#if defined(NV_DRM_DRMP_H_PRESENT)
#include <drm/drmP.h>
+#else
+#include <drm/drm_prime.h>
+#endif
#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..c7239f7 100644
--- a/kernel/nvidia-drm/nvidia-drm-helper.c
+++ b/kernel/nvidia-drm/nvidia-drm-helper.c
@@ -31,7 +31,11 @@
#if defined(NV_DRM_ATOMIC_MODESET_AVAILABLE)
+#if defined(NV_DRM_DRMP_H_PRESENT)
#include <drm/drmP.h>
+#else
+#include <drm/drm_framebuffer.h>
+#endif
#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..11c1d46 100644
--- a/kernel/nvidia-drm/nvidia-drm-helper.h
+++ b/kernel/nvidia-drm/nvidia-drm-helper.h
@@ -27,7 +27,11 @@
#if defined(NV_DRM_AVAILABLE)
+#if defined(NV_DRM_DRMP_H_PRESENT)
#include <drm/drmP.h>
+#else
+#include <drm/drm_drv.h>
+#endif
/*
* 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..57ee6b6 100644
--- a/kernel/nvidia-drm/nvidia-drm-modeset.h
+++ b/kernel/nvidia-drm/nvidia-drm-modeset.h
@@ -27,7 +27,12 @@
#if defined(NV_DRM_ATOMIC_MODESET_AVAILABLE)
+#if defined(NV_DRM_DRMP_H_PRESENT)
#include <drm/drmP.h>
+#else
+#include <drm/drm_atomic.h>
+#include <drm/drm_vblank.h>
+#endif
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..bac396d 100644
--- a/kernel/nvidia-drm/nvidia-drm-os-interface.h
+++ b/kernel/nvidia-drm/nvidia-drm-os-interface.h
@@ -29,7 +29,11 @@
#if defined(NV_DRM_AVAILABLE)
+#if defined(NV_DRM_DRMP_H_PRESENT)
#include <drm/drmP.h>
+#else
+#include <drm/drm_drv.h>
+#endif
/* 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..172fca0 100644
--- a/kernel/nvidia-drm/nvidia-drm-prime-fence.h
+++ b/kernel/nvidia-drm/nvidia-drm-prime-fence.h
@@ -27,7 +27,11 @@
#if defined(NV_DRM_AVAILABLE)
+#if defined(NV_DRM_DRMP_H_PRESENT)
#include <drm/drmP.h>
+#else
+#include <drm/drm_drv.h>
+#endif
#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..f185aed 100644
--- a/kernel/nvidia-drm/nvidia-drm-priv.h
+++ b/kernel/nvidia-drm/nvidia-drm-priv.h
@@ -27,7 +27,9 @@
#if defined(NV_DRM_AVAILABLE)
+#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>
diff --git a/kernel/nvidia-drm/nvidia-drm-utils.h b/kernel/nvidia-drm/nvidia-drm-utils.h
index 6d24120..6a25f33 100644
--- a/kernel/nvidia-drm/nvidia-drm-utils.h
+++ b/kernel/nvidia-drm/nvidia-drm-utils.h
@@ -27,7 +27,13 @@
#if defined(NV_DRM_ATOMIC_MODESET_AVAILABLE)
+#if defined(NV_DRM_DRMP_H_PRESENT)
#include <drm/drmP.h>
+#else
+#include <drm/drm_modes.h>
+#include <drm/drm_plane.h>
+#include <drm/drm_fourcc.h>
+#endif
#include "nvkms-kapi.h"
struct NvKmsKapiConnectorInfo*Offline
#3 2020-01-28 19:58:41
- Roken
- Member
- From: South Wales, UK
- Registered: 2012-01-16
- Posts: 1,359
Re: [SOLVED] Linux 5.5 breaks NVidia
Thank you. However, between before work this morning when I did an update, and arriving home tonight, nvidia-dkms has been updated, presumably with the patch, and now installs just fine.
I suppose I should permanently hold back linux and linux-headers as a fallback (I use zen) for when such things go wrong. Rather than downgrading stuff, I can simply boot a known good kernel.
Marking as SOLVED.
Last edited by Roken (2020-01-28 19:59:59)
Ryzen 5900X 12 core/24 thread - RTX 3090 FE 24 Gb, Asus B550-F Gaming MB, 128Gb Corsair DDR4, Fractal Design Define 7 XL, 5 HD (2 NvME PCI, 4SSD) + 1 x optical.
Linux user #545703
/ is the root of all problems.
Offline
Pages: 1