Rmys
51 lines
1.8 KiB
Diff
51 lines
1.8 KiB
Diff
diff -Nurp NVIDIA-Linux-x86_64-390.87.orig/kernel/nvidia-drm/nvidia-drm-connector.c NVIDIA-Linux-x86_64-390.87/kernel/nvidia-drm/nvidia-drm-connector.c
|
|
--- NVIDIA-Linux-x86_64-390.87.orig/kernel/nvidia-drm/nvidia-drm-connector.c 2018-08-22 03:55:29.000000000 +0300
|
|
+++ NVIDIA-Linux-x86_64-390.87/kernel/nvidia-drm/nvidia-drm-connector.c 2018-11-09 19:46:54.625801192 +0200
|
|
@@ -30,6 +30,8 @@
|
|
#include "nvidia-drm-utils.h"
|
|
#include "nvidia-drm-encoder.h"
|
|
|
|
+#include <linux/version.h>
|
|
+
|
|
#include <drm/drm_crtc_helper.h>
|
|
|
|
#include <drm/drm_atomic.h>
|
|
@@ -226,8 +228,13 @@ static int nv_drm_connector_get_modes(st
|
|
|
|
|
|
if (nv_connector->edid != NULL) {
|
|
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 19, 0)
|
|
drm_mode_connector_update_edid_property(
|
|
connector, nv_connector->edid);
|
|
+#else
|
|
+ drm_connector_update_edid_property(
|
|
+ connector, nv_connector->edid);
|
|
+#endif
|
|
}
|
|
|
|
while (1) {
|
|
diff -Nurp NVIDIA-Linux-x86_64-390.87.orig/kernel/nvidia-drm/nvidia-drm-encoder.c NVIDIA-Linux-x86_64-390.87/kernel/nvidia-drm/nvidia-drm-encoder.c
|
|
--- NVIDIA-Linux-x86_64-390.87.orig/kernel/nvidia-drm/nvidia-drm-encoder.c 2018-08-22 03:55:29.000000000 +0300
|
|
+++ NVIDIA-Linux-x86_64-390.87/kernel/nvidia-drm/nvidia-drm-encoder.c 2018-11-09 19:49:34.863861811 +0200
|
|
@@ -30,6 +30,8 @@
|
|
#include "nvidia-drm-connector.h"
|
|
#include "nvidia-drm-crtc.h"
|
|
|
|
+#include <linux/version.h>
|
|
+
|
|
#include <drm/drm_crtc_helper.h>
|
|
|
|
#include <drm/drm_atomic.h>
|
|
@@ -216,7 +218,11 @@ nv_drm_add_encoder(struct drm_device *de
|
|
|
|
/* Attach encoder and connector */
|
|
|
|
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 19, 0)
|
|
ret = drm_mode_connector_attach_encoder(connector, encoder);
|
|
+#else
|
|
+ ret = drm_connector_attach_encoder(connector, encoder);
|
|
+#endif
|
|
|
|
if (ret != 0) {
|
|
NV_DRM_DEV_LOG_ERR(
|