diff --git a/projects/NXP/devices/iMX8/patches/linux/0001-drm-bridge-mhdp-Add-cdns-mhdp-driver-bridge-driver.patch b/projects/NXP/devices/iMX8/patches/linux/0001-drm-bridge-mhdp-Add-cdns-mhdp-driver-bridge-driver.patch
index f319faddbf..2d4896210b 100644
--- a/projects/NXP/devices/iMX8/patches/linux/0001-drm-bridge-mhdp-Add-cdns-mhdp-driver-bridge-driver.patch
+++ b/projects/NXP/devices/iMX8/patches/linux/0001-drm-bridge-mhdp-Add-cdns-mhdp-driver-bridge-driver.patch
@@ -777,7 +777,7 @@ index 000000000000..da40f62617ef
 +		break;
 +	}
 +
-+	drm_hdmi_avi_infoframe_colorspace(&frame, conn_state);
++	drm_hdmi_avi_infoframe_colorimetry(&frame, conn_state);
 +
 +	adj_mode = &mhdp->bridge.base.encoder->crtc->state->adjusted_mode;
 +
@@ -3452,7 +3452,7 @@ index 000000000000..399c3f6f86ad
 +#ifndef CDNS_MHDP_H
 +#define CDNS_MHDP_H
 +
-+#include <drm/drm_dp_mst_helper.h>
++#include <drm/dp/drm_dp_mst_helper.h>
 +
 +#define CDNS_APB_CFG				0x00000
 +#define CDNS_APB_CTRL				(CDNS_APB_CFG + 0x00)
@@ -4110,7 +4110,7 @@ index a4a45daf93f2..058bc372f02b 100644
 +		DRM_DEV_ERROR(dev, "Failed to valid video %d\n", ret);
  		goto out;
  	}
- out:
+ 
 @@ -652,7 +662,8 @@ static void cdn_dp_encoder_disable(struct drm_encoder *encoder)
  	if (dp->active) {
  		ret = cdn_dp_disable(dp);
@@ -4408,7 +4408,7 @@ index 81ac9b658a70..8b1b15b92503 100644
  #define _CDN_DP_CORE_H
  
 +#include <drm/bridge/cdns-mhdp.h>
- #include <drm/drm_dp_helper.h>
+ #include <drm/dp/drm_dp_helper.h>
  #include <drm/drm_panel.h>
  #include <drm/drm_probe_helper.h>
 @@ -15,35 +16,6 @@
@@ -4489,8 +4489,8 @@ index 81ac9b658a70..8b1b15b92503 100644
  
 -	u8 dpcd[DP_RECEIVER_CAP_SIZE];
  	bool sink_has_audio;
- };
- #endif  /* _CDN_DP_CORE_H */
+ 
+ 	hdmi_codec_plugged_cb plugged_cb;
 diff --git a/drivers/gpu/drm/rockchip/cdn-dp-reg.c b/drivers/gpu/drm/rockchip/cdn-dp-reg.c
 deleted file mode 100644
 index 9d2163ef4d6e..000000000000
@@ -5488,8 +5488,8 @@ index 441248b7a79e..d76716d4edc6 100644
  
 +#include <drm/drm_bridge.h>
 +#include <drm/drm_connector.h>
-+#include <drm/drm_dp_helper.h>
-+#include <drm/drm_dp_mst_helper.h>
++#include <drm/dp/drm_dp_helper.h>
++#include <drm/dp/drm_dp_mst_helper.h>
 +#include <media/cec.h>
  #include <linux/bitops.h>
  
diff --git a/projects/NXP/devices/iMX8/patches/linux/0014-MLK-24611-2-drm-bridge-cdns-Add-callback-function-fo.patch b/projects/NXP/devices/iMX8/patches/linux/0014-MLK-24611-2-drm-bridge-cdns-Add-callback-function-fo.patch
index 15b597e177..4791da4dc2 100644
--- a/projects/NXP/devices/iMX8/patches/linux/0014-MLK-24611-2-drm-bridge-cdns-Add-callback-function-fo.patch
+++ b/projects/NXP/devices/iMX8/patches/linux/0014-MLK-24611-2-drm-bridge-cdns-Add-callback-function-fo.patch
@@ -126,7 +126,7 @@ index 1f8fd024cdfa..6bfd82a3d9a2 100644
 --- a/include/drm/bridge/cdns-mhdp.h
 +++ b/include/drm/bridge/cdns-mhdp.h
 @@ -22,6 +22,7 @@
- #include <drm/drm_dp_mst_helper.h>
+ #include <drm/dp/drm_dp_mst_helper.h>
  #include <media/cec.h>
  #include <linux/bitops.h>
 +#include <sound/hdmi-codec.h>
diff --git a/projects/NXP/devices/iMX8/patches/linux/0030-drm-imx-Add-mhdp-dp-hdmi-driver-for-imx8x-platform.patch b/projects/NXP/devices/iMX8/patches/linux/0030-drm-imx-Add-mhdp-dp-hdmi-driver-for-imx8x-platform.patch
index fd980240ef..b942707e44 100644
--- a/projects/NXP/devices/iMX8/patches/linux/0030-drm-imx-Add-mhdp-dp-hdmi-driver-for-imx8x-platform.patch
+++ b/projects/NXP/devices/iMX8/patches/linux/0030-drm-imx-Add-mhdp-dp-hdmi-driver-for-imx8x-platform.patch
@@ -96,7 +96,7 @@ index 000000000000..a6d03c94d196
 + */
 +#include <linux/clk.h>
 +#include <linux/kernel.h>
-+#include <drm/drm_dp_helper.h>
++#include <drm/dp/drm_dp_helper.h>
 +#include <drm/bridge/cdns-mhdp.h>
 +#include "cdns-mhdp-phy.h"
 +
diff --git a/projects/NXP/devices/iMX8/patches/linux/0041-drm-imx-dcss-add-component-framework-functionality.patch b/projects/NXP/devices/iMX8/patches/linux/0041-drm-imx-dcss-add-component-framework-functionality.patch
index 129438175a..38697f26b3 100644
--- a/projects/NXP/devices/iMX8/patches/linux/0041-drm-imx-dcss-add-component-framework-functionality.patch
+++ b/projects/NXP/devices/iMX8/patches/linux/0041-drm-imx-dcss-add-component-framework-functionality.patch
@@ -17,9 +17,9 @@ index 8dc2f85c514b..09d0ac28e28a 100644
 --- a/drivers/gpu/drm/imx/dcss/dcss-drv.c
 +++ b/drivers/gpu/drm/imx/dcss/dcss-drv.c
 @@ -6,6 +6,7 @@
- #include <linux/module.h>
  #include <linux/kernel.h>
  #include <linux/platform_device.h>
+ #include <drm/drm_module.h>
 +#include <linux/component.h>
  #include <drm/drm_of.h>