diff --git a/drivers/gpu/drm/tegra/dp.c b/drivers/gpu/drm/tegra/dp.c
index a895bd79..63854bae 100644
--- a/drivers/gpu/drm/tegra/dp.c
+++ b/drivers/gpu/drm/tegra/dp.c
@@ -6,7 +6,9 @@
 
 #include <linux/version.h>
 #include <drm/drm_crtc.h>
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 18, 0)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 19, 0)
+#include <drm/display/drm_dp_helper.h>
+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(5, 18, 0)
 #include <drm/dp/drm_dp_helper.h>
 #else
 #include <drm/drm_dp_helper.h>
diff --git a/drivers/gpu/drm/tegra/dpaux.c b/drivers/gpu/drm/tegra/dpaux.c
index 22791115..7e6ebdc7 100644
--- a/drivers/gpu/drm/tegra/dpaux.c
+++ b/drivers/gpu/drm/tegra/dpaux.c
@@ -19,7 +19,9 @@
 #include <linux/version.h>
 #include <linux/workqueue.h>
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 18, 0)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 19, 0)
+#include <drm/display/drm_dp_helper.h>
+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(5, 18, 0)
 #include <drm/dp/drm_dp_helper.h>
 #else
 #include <drm/drm_dp_helper.h>
diff --git a/drivers/gpu/drm/tegra/sor.c b/drivers/gpu/drm/tegra/sor.c
index ca63c3ac..e6c25b7b 100644
--- a/drivers/gpu/drm/tegra/sor.c
+++ b/drivers/gpu/drm/tegra/sor.c
@@ -19,14 +19,20 @@
 
 #include <drm/drm_atomic_helper.h>
 #include <drm/drm_debugfs.h>
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 18, 0)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 19, 0)
+#include <drm/display/drm_dp_helper.h>
+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(5, 18, 0)
 #include <drm/dp/drm_dp_helper.h>
 #else
 #include <drm/drm_dp_helper.h>
 #endif
 #include <drm/drm_file.h>
 #include <drm/drm_panel.h>
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 19, 0)
+#include <drm/display/drm_scdc_helper.h>
+#else
 #include <drm/drm_scdc_helper.h>
+#endif
 #include <drm/drm_simple_kms_helper.h>
 
 #include "dc.h"