diff --git a/target/linux/rockchip/patches-6.6/033-02-v6.7-drm-rockchip-dsi-Add-rv1126-MIPI-DSI-support.patch b/target/linux/rockchip/patches-6.6/033-02-v6.7-drm-rockchip-dsi-Add-rv1126-MIPI-DSI-support.patch
index 83571e238d..768bf93376 100644
--- a/target/linux/rockchip/patches-6.6/033-02-v6.7-drm-rockchip-dsi-Add-rv1126-MIPI-DSI-support.patch
+++ b/target/linux/rockchip/patches-6.6/033-02-v6.7-drm-rockchip-dsi-Add-rv1126-MIPI-DSI-support.patch
@@ -17,7 +17,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20230731110012.2913742-9-jag
 
 --- a/drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c
 +++ b/drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c
-@@ -198,6 +198,11 @@
+@@ -197,6 +197,11 @@
  #define RK3568_DSI1_TURNDISABLE		BIT(2)
  #define RK3568_DSI1_FORCERXMODE		BIT(0)
  
@@ -29,7 +29,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20230731110012.2913742-9-jag
  #define HIWORD_UPDATE(val, mask)	(val | (mask) << 16)
  
  enum {
-@@ -1651,6 +1656,18 @@ static const struct rockchip_dw_dsi_chip
+@@ -1650,6 +1655,18 @@ static const struct rockchip_dw_dsi_chip
  	{ /* sentinel */ }
  };
  
@@ -48,7 +48,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20230731110012.2913742-9-jag
  static const struct of_device_id dw_mipi_dsi_rockchip_dt_ids[] = {
  	{
  	 .compatible = "rockchip,px30-mipi-dsi",
-@@ -1664,6 +1681,9 @@ static const struct of_device_id dw_mipi
+@@ -1663,6 +1680,9 @@ static const struct of_device_id dw_mipi
  	}, {
  	 .compatible = "rockchip,rk3568-mipi-dsi",
  	 .data = &rk3568_chip_data,
diff --git a/target/linux/rockchip/patches-6.6/033-04-v6.7-drm-rockchip-vop2-Demote-message-in-mod_supported-to.patch b/target/linux/rockchip/patches-6.6/033-04-v6.7-drm-rockchip-vop2-Demote-message-in-mod_supported-to.patch
index f0811b3881..152fc80cf8 100644
--- a/target/linux/rockchip/patches-6.6/033-04-v6.7-drm-rockchip-vop2-Demote-message-in-mod_supported-to.patch
+++ b/target/linux/rockchip/patches-6.6/033-04-v6.7-drm-rockchip-vop2-Demote-message-in-mod_supported-to.patch
@@ -22,7 +22,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20231009103753.830458-1-m.tr
 
 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
 +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
-@@ -469,8 +469,8 @@ static bool rockchip_vop2_mod_supported(
+@@ -478,8 +478,8 @@ static bool rockchip_vop2_mod_supported(
  		return true;
  
  	if (!rockchip_afbc(plane, modifier)) {
diff --git a/target/linux/rockchip/patches-6.6/033-05-v6.7-drm-rockchip-remove-redundant-of_match_ptr.patch b/target/linux/rockchip/patches-6.6/033-05-v6.7-drm-rockchip-remove-redundant-of_match_ptr.patch
index 41d6e9d4b6..016b7371ec 100644
--- a/target/linux/rockchip/patches-6.6/033-05-v6.7-drm-rockchip-remove-redundant-of_match_ptr.patch
+++ b/target/linux/rockchip/patches-6.6/033-05-v6.7-drm-rockchip-remove-redundant-of_match_ptr.patch
@@ -22,7 +22,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20230731125304.87059-1-wangz
 
 --- a/drivers/gpu/drm/rockchip/cdn-dp-core.c
 +++ b/drivers/gpu/drm/rockchip/cdn-dp-core.c
-@@ -1261,7 +1261,7 @@ struct platform_driver cdn_dp_driver = {
+@@ -1260,7 +1260,7 @@ struct platform_driver cdn_dp_driver = {
  	.driver = {
  		   .name = "cdn-dp",
  		   .owner = THIS_MODULE,
@@ -33,7 +33,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20230731125304.87059-1-wangz
  };
 --- a/drivers/gpu/drm/rockchip/rockchip_lvds.c
 +++ b/drivers/gpu/drm/rockchip/rockchip_lvds.c
-@@ -751,6 +751,6 @@ struct platform_driver rockchip_lvds_dri
+@@ -750,6 +750,6 @@ struct platform_driver rockchip_lvds_dri
  	.remove_new = rockchip_lvds_remove,
  	.driver = {
  		   .name = "rockchip-lvds",
diff --git a/target/linux/rockchip/patches-6.6/033-06-v6.7-drm-rockchip-dsi-Use-devm_platform_get_and_ioremap_reso.patch b/target/linux/rockchip/patches-6.6/033-06-v6.7-drm-rockchip-dsi-Use-devm_platform_get_and_ioremap_reso.patch
index b7c34d9ab1..875ead1855 100644
--- a/target/linux/rockchip/patches-6.6/033-06-v6.7-drm-rockchip-dsi-Use-devm_platform_get_and_ioremap_reso.patch
+++ b/target/linux/rockchip/patches-6.6/033-06-v6.7-drm-rockchip-dsi-Use-devm_platform_get_and_ioremap_reso.patch
@@ -17,7 +17,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20230421081303.122452-1-yang
 
 --- a/drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c
 +++ b/drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c
-@@ -1358,8 +1358,7 @@ static int dw_mipi_dsi_rockchip_probe(st
+@@ -1357,8 +1357,7 @@ static int dw_mipi_dsi_rockchip_probe(st
  	if (!dsi)
  		return -ENOMEM;
  
diff --git a/target/linux/rockchip/patches-6.6/033-07-v6.7-drm-rockchip-remove-unused-struct-in-vop2.patch b/target/linux/rockchip/patches-6.6/033-07-v6.7-drm-rockchip-remove-unused-struct-in-vop2.patch
index a1611a1a35..a52e143d35 100644
--- a/target/linux/rockchip/patches-6.6/033-07-v6.7-drm-rockchip-remove-unused-struct-in-vop2.patch
+++ b/target/linux/rockchip/patches-6.6/033-07-v6.7-drm-rockchip-remove-unused-struct-in-vop2.patch
@@ -17,7 +17,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20231013122036.1594090-1-and
 
 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
 +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
-@@ -160,7 +160,6 @@ struct vop2_video_port {
+@@ -159,7 +159,6 @@ struct vop2_video_port {
  	struct vop2 *vop2;
  	struct clk *dclk;
  	unsigned int id;
@@ -25,7 +25,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20231013122036.1594090-1-and
  	const struct vop2_video_port_data *data;
  
  	struct completion dsp_hold_completion;
-@@ -2280,7 +2279,6 @@ static int vop2_create_crtcs(struct vop2
+@@ -2337,7 +2336,6 @@ static int vop2_create_crtcs(struct vop2
  		vp = &vop2->vps[i];
  		vp->vop2 = vop2;
  		vp->id = vp_data->id;
diff --git a/target/linux/rockchip/patches-6.6/033-08-v6.7-drm-rockchip-remove-NR_LAYERS-macro-on-vop2.patch b/target/linux/rockchip/patches-6.6/033-08-v6.7-drm-rockchip-remove-NR_LAYERS-macro-on-vop2.patch
index 8718935cbb..58f25b3aa1 100644
--- a/target/linux/rockchip/patches-6.6/033-08-v6.7-drm-rockchip-remove-NR_LAYERS-macro-on-vop2.patch
+++ b/target/linux/rockchip/patches-6.6/033-08-v6.7-drm-rockchip-remove-NR_LAYERS-macro-on-vop2.patch
@@ -16,7 +16,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20231013122051.1594164-1-and
 
 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
 +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
-@@ -2257,8 +2257,6 @@ static struct vop2_video_port *find_vp_w
+@@ -2314,8 +2314,6 @@ static struct vop2_video_port *find_vp_w
  	return NULL;
  }
  
@@ -25,7 +25,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20231013122051.1594164-1-and
  static int vop2_create_crtcs(struct vop2 *vop2)
  {
  	const struct vop2_data *vop2_data = vop2->data;
-@@ -2377,7 +2375,7 @@ static int vop2_create_crtcs(struct vop2
+@@ -2434,7 +2432,7 @@ static int vop2_create_crtcs(struct vop2
  		struct vop2_video_port *vp = &vop2->vps[i];
  
  		if (vp->crtc.port)
diff --git a/target/linux/rockchip/patches-6.6/033-09-v6.7-drm-rockchip-vop-fix-format-bpp-calculation.patch b/target/linux/rockchip/patches-6.6/033-09-v6.7-drm-rockchip-vop-fix-format-bpp-calculation.patch
index 7793309955..99d738306a 100644
--- a/target/linux/rockchip/patches-6.6/033-09-v6.7-drm-rockchip-vop-fix-format-bpp-calculation.patch
+++ b/target/linux/rockchip/patches-6.6/033-09-v6.7-drm-rockchip-vop-fix-format-bpp-calculation.patch
@@ -16,7 +16,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20231018094210.2475771-1-and
 
 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
 +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
-@@ -282,6 +282,20 @@ static void vop2_win_disable(struct vop2
+@@ -281,6 +281,20 @@ static void vop2_win_disable(struct vop2
  		vop2_win_write(win, VOP2_WIN_CLUSTER_ENABLE, 0);
  }
  
@@ -37,7 +37,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20231018094210.2475771-1-and
  static enum vop2_data_format vop2_convert_format(u32 format)
  {
  	switch (format) {
-@@ -482,7 +496,7 @@ static u32 vop2_afbc_transform_offset(st
+@@ -491,7 +505,7 @@ static u32 vop2_afbc_transform_offset(st
  {
  	struct drm_rect *src = &pstate->src;
  	struct drm_framebuffer *fb = pstate->fb;
@@ -46,7 +46,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20231018094210.2475771-1-and
  	u32 vir_width = (fb->pitches[0] << 3) / bpp;
  	u32 width = drm_rect_width(src) >> 16;
  	u32 height = drm_rect_height(src) >> 16;
-@@ -1082,7 +1096,7 @@ static void vop2_plane_atomic_update(str
+@@ -1091,7 +1105,7 @@ static void vop2_plane_atomic_update(str
  	struct drm_display_mode *adjusted_mode = &crtc->state->adjusted_mode;
  	struct vop2 *vop2 = win->vop2;
  	struct drm_framebuffer *fb = pstate->fb;
diff --git a/target/linux/rockchip/patches-6.6/033-10-v6.7-drm-rockchip-vop2-remove-the-unsupported-format-of-cluste.patch b/target/linux/rockchip/patches-6.6/033-10-v6.7-drm-rockchip-vop2-remove-the-unsupported-format-of-cluste.patch
index efc718b526..004cceeba7 100644
--- a/target/linux/rockchip/patches-6.6/033-10-v6.7-drm-rockchip-vop2-remove-the-unsupported-format-of-cluste.patch
+++ b/target/linux/rockchip/patches-6.6/033-10-v6.7-drm-rockchip-vop2-remove-the-unsupported-format-of-cluste.patch
@@ -21,7 +21,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20231018094239.2475851-1-and
 
 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
 +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
-@@ -342,10 +342,6 @@ static enum vop2_afbc_format vop2_conver
+@@ -341,10 +341,6 @@ static enum vop2_afbc_format vop2_conver
  	case DRM_FORMAT_RGB565:
  	case DRM_FORMAT_BGR565:
  		return VOP2_AFBC_FMT_RGB565;
@@ -32,7 +32,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20231018094239.2475851-1-and
  	default:
  		return VOP2_AFBC_FMT_INVALID;
  	}
-@@ -366,25 +362,9 @@ static bool vop2_win_rb_swap(u32 format)
+@@ -365,25 +361,9 @@ static bool vop2_win_rb_swap(u32 format)
  	}
  }
  
@@ -59,7 +59,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20231018094239.2475851-1-and
  }
  
  static bool vop2_win_uv_swap(u32 format)
-@@ -1234,7 +1214,6 @@ static void vop2_plane_atomic_update(str
+@@ -1243,7 +1223,6 @@ static void vop2_plane_atomic_update(str
  			drm_err(vop2->drm, "vp%d %s stride[%d] not 64 pixel aligned\n",
  				vp->id, win->data->name, stride);
  
@@ -67,7 +67,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20231018094239.2475851-1-and
  		uv_swap = vop2_afbc_uv_swap(fb->format->format);
  		/*
  		 * This is a workaround for crazy IC design, Cluster
-@@ -1251,7 +1230,6 @@ static void vop2_plane_atomic_update(str
+@@ -1260,7 +1239,6 @@ static void vop2_plane_atomic_update(str
  		if (vop2_cluster_window(win))
  			vop2_win_write(win, VOP2_WIN_AFBC_ENABLE, 1);
  		vop2_win_write(win, VOP2_WIN_AFBC_FORMAT, afbc_format);
diff --git a/target/linux/rockchip/patches-6.6/033-11-v6.7-drm-rockchip-vop2-Add-more-supported-10bit-formats.patch b/target/linux/rockchip/patches-6.6/033-11-v6.7-drm-rockchip-vop2-Add-more-supported-10bit-formats.patch
index 660845ec0d..6732b117f9 100644
--- a/target/linux/rockchip/patches-6.6/033-11-v6.7-drm-rockchip-vop2-Add-more-supported-10bit-formats.patch
+++ b/target/linux/rockchip/patches-6.6/033-11-v6.7-drm-rockchip-vop2-Add-more-supported-10bit-formats.patch
@@ -17,7 +17,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20231018094318.2476081-1-and
 
 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
 +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
-@@ -299,6 +299,11 @@ static u32 vop2_get_bpp(const struct drm
+@@ -298,6 +298,11 @@ static u32 vop2_get_bpp(const struct drm
  static enum vop2_data_format vop2_convert_format(u32 format)
  {
  	switch (format) {
@@ -29,7 +29,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20231018094318.2476081-1-and
  	case DRM_FORMAT_XRGB8888:
  	case DRM_FORMAT_ARGB8888:
  	case DRM_FORMAT_XBGR8888:
-@@ -311,10 +316,19 @@ static enum vop2_data_format vop2_conver
+@@ -310,10 +315,19 @@ static enum vop2_data_format vop2_conver
  	case DRM_FORMAT_BGR565:
  		return VOP2_FMT_RGB565;
  	case DRM_FORMAT_NV12:
@@ -49,7 +49,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20231018094318.2476081-1-and
  		return VOP2_FMT_YUV444SP;
  	case DRM_FORMAT_YUYV:
  	case DRM_FORMAT_YVYU:
-@@ -331,6 +345,11 @@ static enum vop2_data_format vop2_conver
+@@ -330,6 +344,11 @@ static enum vop2_data_format vop2_conver
  static enum vop2_afbc_format vop2_convert_afbc_format(u32 format)
  {
  	switch (format) {
@@ -61,7 +61,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20231018094318.2476081-1-and
  	case DRM_FORMAT_XRGB8888:
  	case DRM_FORMAT_ARGB8888:
  	case DRM_FORMAT_XBGR8888:
-@@ -342,6 +361,17 @@ static enum vop2_afbc_format vop2_conver
+@@ -341,6 +360,17 @@ static enum vop2_afbc_format vop2_conver
  	case DRM_FORMAT_RGB565:
  	case DRM_FORMAT_BGR565:
  		return VOP2_AFBC_FMT_RGB565;
@@ -79,7 +79,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20231018094318.2476081-1-and
  	default:
  		return VOP2_AFBC_FMT_INVALID;
  	}
-@@ -352,6 +382,8 @@ static enum vop2_afbc_format vop2_conver
+@@ -351,6 +381,8 @@ static enum vop2_afbc_format vop2_conver
  static bool vop2_win_rb_swap(u32 format)
  {
  	switch (format) {
@@ -88,7 +88,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20231018094318.2476081-1-and
  	case DRM_FORMAT_XBGR8888:
  	case DRM_FORMAT_ABGR8888:
  	case DRM_FORMAT_BGR888:
-@@ -364,7 +396,15 @@ static bool vop2_win_rb_swap(u32 format)
+@@ -363,7 +395,15 @@ static bool vop2_win_rb_swap(u32 format)
  
  static bool vop2_afbc_uv_swap(u32 format)
  {
@@ -105,7 +105,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20231018094318.2476081-1-and
  }
  
  static bool vop2_win_uv_swap(u32 format)
-@@ -373,6 +413,9 @@ static bool vop2_win_uv_swap(u32 format)
+@@ -372,6 +412,9 @@ static bool vop2_win_uv_swap(u32 format)
  	case DRM_FORMAT_NV12:
  	case DRM_FORMAT_NV16:
  	case DRM_FORMAT_NV24:
diff --git a/target/linux/rockchip/patches-6.6/033-15-v6.8-drm-rockchip-vop2-Add-NV20-and-NV30-support.patch b/target/linux/rockchip/patches-6.6/033-15-v6.8-drm-rockchip-vop2-Add-NV20-and-NV30-support.patch
index ead6b64a9f..b22dbeb530 100644
--- a/target/linux/rockchip/patches-6.6/033-15-v6.8-drm-rockchip-vop2-Add-NV20-and-NV30-support.patch
+++ b/target/linux/rockchip/patches-6.6/033-15-v6.8-drm-rockchip-vop2-Add-NV20-and-NV30-support.patch
@@ -28,7 +28,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20231025213248.2641962-1-jon
 
 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
 +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
-@@ -325,11 +325,14 @@ static enum vop2_data_format vop2_conver
+@@ -324,11 +324,14 @@ static enum vop2_data_format vop2_conver
  	case DRM_FORMAT_NV16:
  	case DRM_FORMAT_NV61:
  		return VOP2_FMT_YUV422SP;
@@ -43,7 +43,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20231025213248.2641962-1-jon
  	case DRM_FORMAT_YUYV:
  	case DRM_FORMAT_YVYU:
  		return VOP2_FMT_VYUY422;
-@@ -414,6 +417,8 @@ static bool vop2_win_uv_swap(u32 format)
+@@ -413,6 +416,8 @@ static bool vop2_win_uv_swap(u32 format)
  	case DRM_FORMAT_NV16:
  	case DRM_FORMAT_NV24:
  	case DRM_FORMAT_NV15:
diff --git a/target/linux/rockchip/patches-6.6/033-16-v6.8-drm-rockchip-rk3066_hdmi-Remove-useless-mode_fixup.patch b/target/linux/rockchip/patches-6.6/033-16-v6.8-drm-rockchip-rk3066_hdmi-Remove-useless-mode_fixup.patch
index 861e58df1c..a021bd6478 100644
--- a/target/linux/rockchip/patches-6.6/033-16-v6.8-drm-rockchip-rk3066_hdmi-Remove-useless-mode_fixup.patch
+++ b/target/linux/rockchip/patches-6.6/033-16-v6.8-drm-rockchip-rk3066_hdmi-Remove-useless-mode_fixup.patch
@@ -15,7 +15,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/5649ac03-db92-42a9-d86a-76df
 
 --- a/drivers/gpu/drm/rockchip/rk3066_hdmi.c
 +++ b/drivers/gpu/drm/rockchip/rk3066_hdmi.c
-@@ -434,14 +434,6 @@ static void rk3066_hdmi_encoder_disable(
+@@ -433,14 +433,6 @@ static void rk3066_hdmi_encoder_disable(
  	rk3066_hdmi_set_power_mode(hdmi, HDMI_SYS_POWER_MODE_A);
  }
  
@@ -30,7 +30,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/5649ac03-db92-42a9-d86a-76df
  static int
  rk3066_hdmi_encoder_atomic_check(struct drm_encoder *encoder,
  				 struct drm_crtc_state *crtc_state,
-@@ -459,7 +451,6 @@ static const
+@@ -458,7 +450,6 @@ static const
  struct drm_encoder_helper_funcs rk3066_hdmi_encoder_helper_funcs = {
  	.enable       = rk3066_hdmi_encoder_enable,
  	.disable      = rk3066_hdmi_encoder_disable,
diff --git a/target/linux/rockchip/patches-6.6/033-17-v6.8-drm-rockchip-rk3066_hdmi-Switch-encoder-hooks-to-atomic.patch b/target/linux/rockchip/patches-6.6/033-17-v6.8-drm-rockchip-rk3066_hdmi-Switch-encoder-hooks-to-atomic.patch
index 11679324e8..e91607278a 100644
--- a/target/linux/rockchip/patches-6.6/033-17-v6.8-drm-rockchip-rk3066_hdmi-Switch-encoder-hooks-to-atomic.patch
+++ b/target/linux/rockchip/patches-6.6/033-17-v6.8-drm-rockchip-rk3066_hdmi-Switch-encoder-hooks-to-atomic.patch
@@ -17,7 +17,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/034c3446-d619-f4c3-3aaa-ab51
 
 --- a/drivers/gpu/drm/rockchip/rk3066_hdmi.c
 +++ b/drivers/gpu/drm/rockchip/rk3066_hdmi.c
-@@ -55,7 +55,6 @@ struct rk3066_hdmi {
+@@ -54,7 +54,6 @@ struct rk3066_hdmi {
  	unsigned int tmdsclk;
  
  	struct hdmi_data_info hdmi_data;
@@ -25,7 +25,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/034c3446-d619-f4c3-3aaa-ab51
  };
  
  static struct rk3066_hdmi *encoder_to_rk3066_hdmi(struct drm_encoder *encoder)
-@@ -387,21 +386,21 @@ static int rk3066_hdmi_setup(struct rk30
+@@ -386,21 +385,21 @@ static int rk3066_hdmi_setup(struct rk30
  	return 0;
  }
  
@@ -58,7 +58,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/034c3446-d619-f4c3-3aaa-ab51
  
  	mux = drm_of_encoder_active_endpoint_id(hdmi->dev->of_node, encoder);
  	if (mux)
-@@ -414,10 +413,11 @@ static void rk3066_hdmi_encoder_enable(s
+@@ -413,10 +412,11 @@ static void rk3066_hdmi_encoder_enable(s
  	DRM_DEV_DEBUG(hdmi->dev, "hdmi encoder enable select: vop%s\n",
  		      (mux) ? "1" : "0");
  
@@ -72,7 +72,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/034c3446-d619-f4c3-3aaa-ab51
  {
  	struct rk3066_hdmi *hdmi = encoder_to_rk3066_hdmi(encoder);
  
-@@ -449,10 +449,9 @@ rk3066_hdmi_encoder_atomic_check(struct
+@@ -448,10 +448,9 @@ rk3066_hdmi_encoder_atomic_check(struct
  
  static const
  struct drm_encoder_helper_funcs rk3066_hdmi_encoder_helper_funcs = {
diff --git a/target/linux/rockchip/patches-6.6/033-20-v6.8-Revert-drm-rockchip-vop2-Use-regcache_sync-to-fix.patch b/target/linux/rockchip/patches-6.6/033-20-v6.8-Revert-drm-rockchip-vop2-Use-regcache_sync-to-fix.patch
index 563a67e13e..7e149f6171 100644
--- a/target/linux/rockchip/patches-6.6/033-20-v6.8-Revert-drm-rockchip-vop2-Use-regcache_sync-to-fix.patch
+++ b/target/linux/rockchip/patches-6.6/033-20-v6.8-Revert-drm-rockchip-vop2-Use-regcache_sync-to-fix.patch
@@ -27,7 +27,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20231211115719.1784834-1-and
 
 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
 +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
-@@ -217,6 +217,8 @@ struct vop2 {
+@@ -216,6 +216,8 @@ struct vop2 {
  	struct vop2_win win[];
  };
  
@@ -36,7 +36,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20231211115719.1784834-1-and
  static struct vop2_video_port *to_vop2_video_port(struct drm_crtc *crtc)
  {
  	return container_of(crtc, struct vop2_video_port, crtc);
-@@ -885,7 +887,11 @@ static void vop2_enable(struct vop2 *vop
+@@ -894,7 +896,11 @@ static void vop2_enable(struct vop2 *vop
  		return;
  	}
  
@@ -49,7 +49,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20231211115719.1784834-1-and
  
  	if (vop2->data->soc_id == 3566)
  		vop2_writel(vop2, RK3568_OTP_WIN_EN, 1);
-@@ -915,8 +921,6 @@ static void vop2_disable(struct vop2 *vo
+@@ -924,8 +930,6 @@ static void vop2_disable(struct vop2 *vo
  
  	pm_runtime_put_sync(vop2->dev);
  
diff --git a/target/linux/rockchip/patches-6.6/033-21-v6.8-drm-rockchip-vop2-set-half_block_en-bit-in-all-mode.patch b/target/linux/rockchip/patches-6.6/033-21-v6.8-drm-rockchip-vop2-set-half_block_en-bit-in-all-mode.patch
index b4cd23878c..6eedf847bf 100644
--- a/target/linux/rockchip/patches-6.6/033-21-v6.8-drm-rockchip-vop2-set-half_block_en-bit-in-all-mode.patch
+++ b/target/linux/rockchip/patches-6.6/033-21-v6.8-drm-rockchip-vop2-set-half_block_en-bit-in-all-mode.patch
@@ -21,7 +21,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20231211115730.1784893-1-and
 
 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
 +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
-@@ -521,6 +521,18 @@ static bool rockchip_vop2_mod_supported(
+@@ -530,6 +530,18 @@ static bool rockchip_vop2_mod_supported(
  	return vop2_convert_afbc_format(format) >= 0;
  }
  
@@ -40,7 +40,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20231211115730.1784893-1-and
  static u32 vop2_afbc_transform_offset(struct drm_plane_state *pstate,
  				      bool afbc_half_block_en)
  {
-@@ -1146,6 +1158,7 @@ static void vop2_plane_atomic_update(str
+@@ -1155,6 +1167,7 @@ static void vop2_plane_atomic_update(str
  	bool rotate_90 = pstate->rotation & DRM_MODE_ROTATE_90;
  	struct rockchip_gem_object *rk_obj;
  	unsigned long offset;
@@ -48,7 +48,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20231211115730.1784893-1-and
  	bool afbc_en;
  	dma_addr_t yrgb_mst;
  	dma_addr_t uv_mst;
-@@ -1238,6 +1251,7 @@ static void vop2_plane_atomic_update(str
+@@ -1247,6 +1260,7 @@ static void vop2_plane_atomic_update(str
  	dsp_info = (dsp_h - 1) << 16 | ((dsp_w - 1) & 0xffff);
  
  	format = vop2_convert_format(fb->format->format);
@@ -56,7 +56,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20231211115730.1784893-1-and
  
  	drm_dbg(vop2->drm, "vp%d update %s[%dx%d->%dx%d@%dx%d] fmt[%p4cc_%s] addr[%pad]\n",
  		vp->id, win->data->name, actual_w, actual_h, dsp_w, dsp_h,
-@@ -1245,6 +1259,9 @@ static void vop2_plane_atomic_update(str
+@@ -1254,6 +1268,9 @@ static void vop2_plane_atomic_update(str
  		&fb->format->format,
  		afbc_en ? "AFBC" : "", &yrgb_mst);
  
@@ -66,7 +66,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20231211115730.1784893-1-and
  	if (afbc_en) {
  		u32 stride;
  
-@@ -1285,13 +1302,7 @@ static void vop2_plane_atomic_update(str
+@@ -1294,13 +1311,7 @@ static void vop2_plane_atomic_update(str
  		vop2_win_write(win, VOP2_WIN_AFBC_UV_SWAP, uv_swap);
  		vop2_win_write(win, VOP2_WIN_AFBC_AUTO_GATING_EN, 0);
  		vop2_win_write(win, VOP2_WIN_AFBC_BLOCK_SPLIT_EN, 0);
diff --git a/target/linux/rockchip/patches-6.6/033-23-v6.8-drm-rockchip-vop2-Add-write-mask-for-VP-config-done.patch b/target/linux/rockchip/patches-6.6/033-23-v6.8-drm-rockchip-vop2-Add-write-mask-for-VP-config-done.patch
index 33ca068702..cfb2ed2f9f 100644
--- a/target/linux/rockchip/patches-6.6/033-23-v6.8-drm-rockchip-vop2-Add-write-mask-for-VP-config-done.patch
+++ b/target/linux/rockchip/patches-6.6/033-23-v6.8-drm-rockchip-vop2-Add-write-mask-for-VP-config-done.patch
@@ -22,7 +22,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20231211115752.1785013-1-and
 
 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
 +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
-@@ -268,12 +268,23 @@ static bool vop2_cluster_window(const st
+@@ -267,12 +267,23 @@ static bool vop2_cluster_window(const st
  	return win->data->feature & WIN_FEATURE_CLUSTER;
  }
  
diff --git a/target/linux/rockchip/patches-6.6/033-26-v6.8-drm-rockchip-vop2-rename-grf-to-sys_grf.patch b/target/linux/rockchip/patches-6.6/033-26-v6.8-drm-rockchip-vop2-rename-grf-to-sys_grf.patch
index 156b4703d9..96f85f039a 100644
--- a/target/linux/rockchip/patches-6.6/033-26-v6.8-drm-rockchip-vop2-rename-grf-to-sys_grf.patch
+++ b/target/linux/rockchip/patches-6.6/033-26-v6.8-drm-rockchip-vop2-rename-grf-to-sys_grf.patch
@@ -18,7 +18,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20231211115826.1785190-1-and
 
 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
 +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
-@@ -190,7 +190,7 @@ struct vop2 {
+@@ -189,7 +189,7 @@ struct vop2 {
  	void __iomem *regs;
  	struct regmap *map;
  
@@ -27,7 +27,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20231211115826.1785190-1-and
  
  	/* physical map length of vop2 register */
  	u32 len;
-@@ -1526,9 +1526,9 @@ static void rk3568_set_intf_mux(struct v
+@@ -1535,9 +1535,9 @@ static void rk3568_set_intf_mux(struct v
  		dip &= ~RK3568_DSP_IF_POL__RGB_LVDS_PIN_POL;
  		dip |= FIELD_PREP(RK3568_DSP_IF_POL__RGB_LVDS_PIN_POL, polflags);
  		if (polflags & POLFLAG_DCLK_INV)
@@ -39,7 +39,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20231211115826.1785190-1-and
  		break;
  	case ROCKCHIP_VOP2_EP_HDMI0:
  		die &= ~RK3568_SYS_DSP_INFACE_EN_HDMI_MUX;
-@@ -2769,7 +2769,7 @@ static int vop2_bind(struct device *dev,
+@@ -2821,7 +2821,7 @@ static int vop2_bind(struct device *dev,
  			return PTR_ERR(vop2->lut_regs);
  	}
  
diff --git a/target/linux/rockchip/patches-6.6/033-28-v6.8-drm-rockchip-vop2-Add-support-for-rk3588.patch b/target/linux/rockchip/patches-6.6/033-28-v6.8-drm-rockchip-vop2-Add-support-for-rk3588.patch
index a2d8efc22e..6c7d7a152b 100644
--- a/target/linux/rockchip/patches-6.6/033-28-v6.8-drm-rockchip-vop2-Add-support-for-rk3588.patch
+++ b/target/linux/rockchip/patches-6.6/033-28-v6.8-drm-rockchip-vop2-Add-support-for-rk3588.patch
@@ -26,7 +26,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20231211115919.1785435-1-and
 
 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
 +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
-@@ -191,6 +191,9 @@ struct vop2 {
+@@ -190,6 +190,9 @@ struct vop2 {
  	struct regmap *map;
  
  	struct regmap *sys_grf;
@@ -36,7 +36,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20231211115919.1785435-1-and
  
  	/* physical map length of vop2 register */
  	u32 len;
-@@ -209,6 +212,7 @@ struct vop2 {
+@@ -208,6 +211,7 @@ struct vop2 {
  	unsigned int enable_count;
  	struct clk *hclk;
  	struct clk *aclk;
@@ -44,7 +44,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20231211115919.1785435-1-and
  
  	/* optional internal rgb encoder */
  	struct rockchip_rgb *rgb;
-@@ -217,6 +221,23 @@ struct vop2 {
+@@ -216,6 +220,23 @@ struct vop2 {
  	struct vop2_win win[];
  };
  
@@ -68,7 +68,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20231211115919.1785435-1-and
  static const struct regmap_config vop2_regmap_config;
  
  static struct vop2_video_port *to_vop2_video_port(struct drm_crtc *crtc)
-@@ -475,6 +496,17 @@ static bool vop2_output_uv_swap(u32 bus_
+@@ -474,6 +495,17 @@ static bool vop2_output_uv_swap(u32 bus_
  		return false;
  }
  
@@ -86,7 +86,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20231211115919.1785435-1-and
  static bool is_yuv_output(u32 bus_format)
  {
  	switch (bus_format) {
-@@ -881,13 +913,32 @@ static int vop2_core_clks_prepare_enable
+@@ -890,13 +922,32 @@ static int vop2_core_clks_prepare_enable
  		goto err;
  	}
  
@@ -119,7 +119,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20231211115919.1785435-1-and
  static void vop2_enable(struct vop2 *vop2)
  {
  	int ret;
-@@ -919,6 +970,9 @@ static void vop2_enable(struct vop2 *vop
+@@ -928,6 +979,9 @@ static void vop2_enable(struct vop2 *vop
  	if (vop2->data->soc_id == 3566)
  		vop2_writel(vop2, RK3568_OTP_WIN_EN, 1);
  
@@ -129,7 +129,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20231211115919.1785435-1-and
  	vop2_writel(vop2, RK3568_REG_CFG_DONE, RK3568_REG_CFG_DONE__GLB_CFG_DONE_EN);
  
  	/*
-@@ -944,6 +998,7 @@ static void vop2_disable(struct vop2 *vo
+@@ -953,6 +1007,7 @@ static void vop2_disable(struct vop2 *vo
  
  	pm_runtime_put_sync(vop2->dev);
  
@@ -137,7 +137,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20231211115919.1785435-1-and
  	clk_disable_unprepare(vop2->aclk);
  	clk_disable_unprepare(vop2->hclk);
  }
-@@ -1311,7 +1366,19 @@ static void vop2_plane_atomic_update(str
+@@ -1320,7 +1375,19 @@ static void vop2_plane_atomic_update(str
  			vop2_win_write(win, VOP2_WIN_AFBC_ENABLE, 1);
  		vop2_win_write(win, VOP2_WIN_AFBC_FORMAT, afbc_format);
  		vop2_win_write(win, VOP2_WIN_AFBC_UV_SWAP, uv_swap);
@@ -158,7 +158,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20231211115919.1785435-1-and
  		vop2_win_write(win, VOP2_WIN_AFBC_BLOCK_SPLIT_EN, 0);
  		transform_offset = vop2_afbc_transform_offset(pstate, half_block_en);
  		vop2_win_write(win, VOP2_WIN_AFBC_HDR_PTR, yrgb_mst);
-@@ -1509,10 +1576,10 @@ static void vop2_post_config(struct drm_
+@@ -1518,10 +1585,10 @@ static void vop2_post_config(struct drm_
  	vop2_vp_write(vp, RK3568_VP_DSP_BG, 0);
  }
  
@@ -171,18 +171,18 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20231211115919.1785435-1-and
  	u32 die, dip;
  
  	die = vop2_readl(vop2, RK3568_DSP_IF_EN);
-@@ -1574,13 +1641,281 @@ static void rk3568_set_intf_mux(struct v
+@@ -1583,13 +1650,281 @@ static void rk3568_set_intf_mux(struct v
  		break;
  	default:
  		drm_err(vop2->drm, "Invalid interface id %d on vp%d\n", id, vp->id);
 -		return;
 +		return 0;
-+	}
-+
-+	dip |= RK3568_DSP_IF_POL__CFG_DONE_IMD;
-+
-+	vop2_writel(vop2, RK3568_DSP_IF_EN, die);
-+	vop2_writel(vop2, RK3568_DSP_IF_POL, dip);
+ 	}
+ 
+ 	dip |= RK3568_DSP_IF_POL__CFG_DONE_IMD;
+ 
+ 	vop2_writel(vop2, RK3568_DSP_IF_EN, die);
+ 	vop2_writel(vop2, RK3568_DSP_IF_POL, dip);
 +
 +	return crtc->state->adjusted_mode.crtc_clock  * 1000LL;
 +}
@@ -429,14 +429,14 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20231211115919.1785435-1-and
 +	default:
 +		drm_err(vop2->drm, "Invalid interface id %d on vp%d\n", id, vp->id);
 +		return 0;
- 	}
- 
- 	dip |= RK3568_DSP_IF_POL__CFG_DONE_IMD;
- 
++	}
++
++	dip |= RK3568_DSP_IF_POL__CFG_DONE_IMD;
++
 +	vop2_vp_write(vp, RK3588_VP_CLK_CTRL, vp_clk_div);
- 	vop2_writel(vop2, RK3568_DSP_IF_EN, die);
++	vop2_writel(vop2, RK3568_DSP_IF_EN, die);
 +	vop2_writel(vop2, RK3568_DSP_IF_CTRL, div);
- 	vop2_writel(vop2, RK3568_DSP_IF_POL, dip);
++	vop2_writel(vop2, RK3568_DSP_IF_POL, dip);
 +
 +	return clock;
 +}
@@ -454,7 +454,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20231211115919.1785435-1-and
  }
  
  static int us_to_vertical_line(struct drm_display_mode *mode, int us)
-@@ -1650,9 +1985,17 @@ static void vop2_crtc_atomic_enable(stru
+@@ -1659,9 +1994,17 @@ static void vop2_crtc_atomic_enable(stru
  	drm_for_each_encoder_mask(encoder, crtc->dev, crtc_state->encoder_mask) {
  		struct rockchip_encoder *rkencoder = to_rockchip_encoder(encoder);
  
@@ -473,7 +473,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20231211115919.1785435-1-and
  	if (vcstate->output_mode == ROCKCHIP_OUT_MODE_AAAA &&
  	    !(vp_data->feature & VOP_FEATURE_OUTPUT_10BIT))
  		out_mode = ROCKCHIP_OUT_MODE_P888;
-@@ -1663,6 +2006,8 @@ static void vop2_crtc_atomic_enable(stru
+@@ -1672,6 +2015,8 @@ static void vop2_crtc_atomic_enable(stru
  
  	if (vop2_output_uv_swap(vcstate->bus_format, vcstate->output_mode))
  		dsp_ctrl |= RK3568_VP_DSP_CTRL__DSP_RB_SWAP;
@@ -482,7 +482,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20231211115919.1785435-1-and
  
  	if (vcstate->yuv_overlay)
  		dsp_ctrl |= RK3568_VP_DSP_CTRL__POST_DSP_OUT_R2Y;
-@@ -2024,6 +2369,14 @@ static void vop2_setup_layer_mixer(struc
+@@ -2079,6 +2424,14 @@ static void vop2_setup_layer_mixer(struc
  			port_sel &= ~RK3568_OVL_PORT_SEL__CLUSTER1;
  			port_sel |= FIELD_PREP(RK3568_OVL_PORT_SEL__CLUSTER1, vp->id);
  			break;
@@ -497,7 +497,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20231211115919.1785435-1-and
  		case ROCKCHIP_VOP2_ESMART0:
  			port_sel &= ~RK3568_OVL_PORT_SEL__ESMART0;
  			port_sel |= FIELD_PREP(RK3568_OVL_PORT_SEL__ESMART0, vp->id);
-@@ -2032,6 +2385,14 @@ static void vop2_setup_layer_mixer(struc
+@@ -2087,6 +2440,14 @@ static void vop2_setup_layer_mixer(struc
  			port_sel &= ~RK3568_OVL_PORT_SEL__ESMART1;
  			port_sel |= FIELD_PREP(RK3568_OVL_PORT_SEL__ESMART1, vp->id);
  			break;
@@ -512,7 +512,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20231211115919.1785435-1-and
  		case ROCKCHIP_VOP2_SMART0:
  			port_sel &= ~RK3568_OVL_PORT_SEL__SMART0;
  			port_sel |= FIELD_PREP(RK3568_OVL_PORT_SEL__SMART0, vp->id);
-@@ -2768,8 +3129,29 @@ static int vop2_bind(struct device *dev,
+@@ -2820,8 +3181,29 @@ static int vop2_bind(struct device *dev,
  		if (IS_ERR(vop2->lut_regs))
  			return PTR_ERR(vop2->lut_regs);
  	}
@@ -543,7 +543,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20231211115919.1785435-1-and
  
  	vop2->hclk = devm_clk_get(vop2->dev, "hclk");
  	if (IS_ERR(vop2->hclk)) {
-@@ -2783,6 +3165,12 @@ static int vop2_bind(struct device *dev,
+@@ -2835,6 +3217,12 @@ static int vop2_bind(struct device *dev,
  		return PTR_ERR(vop2->aclk);
  	}
  
@@ -558,7 +558,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20231211115919.1785435-1-and
  		drm_err(vop2->drm, "cannot find irq for vop2\n");
 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.h
 +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.h
-@@ -13,9 +13,16 @@
+@@ -14,9 +14,16 @@
  
  #define VOP_FEATURE_OUTPUT_10BIT        BIT(0)
  
@@ -575,7 +575,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20231211115919.1785435-1-and
  /*
   *  the delay number of a window in different mode.
   */
-@@ -38,6 +45,18 @@ enum vop2_scale_down_mode {
+@@ -39,6 +46,18 @@ enum vop2_scale_down_mode {
  	VOP2_SCALE_DOWN_AVG,
  };
  
@@ -594,7 +594,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20231211115919.1785435-1-and
  enum vop2_win_regs {
  	VOP2_WIN_ENABLE,
  	VOP2_WIN_FORMAT,
-@@ -138,6 +157,7 @@ struct vop2_video_port_data {
+@@ -139,6 +158,7 @@ struct vop2_video_port_data {
  
  struct vop2_data {
  	u8 nr_vps;
@@ -602,7 +602,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20231211115919.1785435-1-and
  	const struct vop2_win_data *win;
  	const struct vop2_video_port_data *vp;
  	struct vop_rect max_input;
-@@ -192,6 +212,11 @@ enum dst_factor_mode {
+@@ -193,6 +213,11 @@ enum dst_factor_mode {
  };
  
  #define RK3568_GRF_VO_CON1			0x0364
@@ -614,7 +614,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20231211115919.1785435-1-and
  /* System registers definition */
  #define RK3568_REG_CFG_DONE			0x000
  #define RK3568_VERSION_INFO			0x004
-@@ -200,6 +225,7 @@ enum dst_factor_mode {
+@@ -201,6 +226,7 @@ enum dst_factor_mode {
  #define RK3568_DSP_IF_EN			0x028
  #define RK3568_DSP_IF_CTRL			0x02c
  #define RK3568_DSP_IF_POL			0x030
@@ -622,7 +622,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20231211115919.1785435-1-and
  #define RK3568_WB_CTRL				0x40
  #define RK3568_WB_XSCAL_FACTOR			0x44
  #define RK3568_WB_YRGB_MST			0x48
-@@ -220,9 +246,14 @@ enum dst_factor_mode {
+@@ -221,9 +247,14 @@ enum dst_factor_mode {
  #define RK3568_VP_INT_RAW_STATUS(vp)		(0xAC + (vp) * 0x10)
  
  /* Video Port registers definition */
@@ -637,7 +637,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20231211115919.1785435-1-and
  #define RK3568_VP_3D_LUT_CTRL			0x10
  #define RK3568_VP_3D_LUT_MST			0x20
  #define RK3568_VP_DSP_BG			0x2C
-@@ -264,6 +295,17 @@ enum dst_factor_mode {
+@@ -265,6 +296,17 @@ enum dst_factor_mode {
  #define RK3568_SMART_DLY_NUM			0x6F8
  
  /* Cluster register definition, offset relative to window base */
@@ -655,7 +655,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20231211115919.1785435-1-and
  #define RK3568_CLUSTER_WIN_CTRL0		0x00
  #define RK3568_CLUSTER_WIN_CTRL1		0x04
  #define RK3568_CLUSTER_WIN_YRGB_MST		0x10
-@@ -357,13 +399,18 @@ enum dst_factor_mode {
+@@ -358,13 +400,18 @@ enum dst_factor_mode {
  #define RK3568_VP_DSP_CTRL__DITHER_DOWN_EN		BIT(17)
  #define RK3568_VP_DSP_CTRL__PRE_DITHER_DOWN_EN		BIT(16)
  #define RK3568_VP_DSP_CTRL__POST_DSP_OUT_R2Y		BIT(15)
@@ -674,7 +674,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20231211115919.1785435-1-and
  #define RK3568_VP_POST_SCL_CTRL__VSCALEDOWN		BIT(1)
  #define RK3568_VP_POST_SCL_CTRL__HSCALEDOWN		BIT(0)
  
-@@ -382,11 +429,37 @@ enum dst_factor_mode {
+@@ -383,11 +430,37 @@ enum dst_factor_mode {
  #define RK3568_SYS_DSP_INFACE_EN_HDMI			BIT(1)
  #define RK3568_SYS_DSP_INFACE_EN_RGB			BIT(0)
  
@@ -712,7 +712,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20231211115919.1785435-1-and
  #define RK3568_VP0_MIPI_CTRL__DCLK_DIV2_PHASE_LOCK	BIT(5)
  #define RK3568_VP0_MIPI_CTRL__DCLK_DIV2			BIT(4)
  
-@@ -408,8 +481,12 @@ enum dst_factor_mode {
+@@ -409,8 +482,12 @@ enum dst_factor_mode {
  #define RK3568_OVL_PORT_SEL__SEL_PORT			GENMASK(31, 16)
  #define RK3568_OVL_PORT_SEL__SMART1			GENMASK(31, 30)
  #define RK3568_OVL_PORT_SEL__SMART0			GENMASK(29, 28)
@@ -725,7 +725,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20231211115919.1785435-1-and
  #define RK3568_OVL_PORT_SEL__CLUSTER1			GENMASK(19, 18)
  #define RK3568_OVL_PORT_SEL__CLUSTER0			GENMASK(17, 16)
  #define RK3568_OVL_PORT_SET__PORT2_MUX			GENMASK(11, 8)
-@@ -422,6 +499,10 @@ enum dst_factor_mode {
+@@ -423,6 +500,10 @@ enum dst_factor_mode {
  #define RK3568_CLUSTER_DLY_NUM__CLUSTER0_1		GENMASK(15, 8)
  #define RK3568_CLUSTER_DLY_NUM__CLUSTER0_0		GENMASK(7, 0)
  
diff --git a/target/linux/rockchip/patches-6.6/033-29-v6.8-drm-rockchip-vop2-rename-VOP_FEATURE_OUTPUT_10BIT-to.patch b/target/linux/rockchip/patches-6.6/033-29-v6.8-drm-rockchip-vop2-rename-VOP_FEATURE_OUTPUT_10BIT-to.patch
index 1db6bdabe0..1fa3600b42 100644
--- a/target/linux/rockchip/patches-6.6/033-29-v6.8-drm-rockchip-vop2-rename-VOP_FEATURE_OUTPUT_10BIT-to.patch
+++ b/target/linux/rockchip/patches-6.6/033-29-v6.8-drm-rockchip-vop2-rename-VOP_FEATURE_OUTPUT_10BIT-to.patch
@@ -20,7 +20,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20231211115931.1785495-1-and
 
 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
 +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
-@@ -1997,7 +1997,7 @@ static void vop2_crtc_atomic_enable(stru
+@@ -2006,7 +2006,7 @@ static void vop2_crtc_atomic_enable(stru
  		return;
  
  	if (vcstate->output_mode == ROCKCHIP_OUT_MODE_AAAA &&
@@ -31,8 +31,8 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20231211115931.1785495-1-and
  		out_mode = vcstate->output_mode;
 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.h
 +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.h
-@@ -11,7 +11,7 @@
- #include <drm/drm_modes.h>
+@@ -12,7 +12,7 @@
+ #include "rockchip_drm_drv.h"
  #include "rockchip_drm_vop.h"
  
 -#define VOP_FEATURE_OUTPUT_10BIT        BIT(0)
diff --git a/target/linux/rockchip/patches-6.6/033-30-v6.8-drm-rockchip-vop2-Avoid-use-regmap_reinit_cache-at-runtim.patch b/target/linux/rockchip/patches-6.6/033-30-v6.8-drm-rockchip-vop2-Avoid-use-regmap_reinit_cache-at-runtim.patch
index 9e691b0da5..5e6bc5f5cb 100644
--- a/target/linux/rockchip/patches-6.6/033-30-v6.8-drm-rockchip-vop2-Avoid-use-regmap_reinit_cache-at-runtim.patch
+++ b/target/linux/rockchip/patches-6.6/033-30-v6.8-drm-rockchip-vop2-Avoid-use-regmap_reinit_cache-at-runtim.patch
@@ -35,7 +35,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20231217084415.2373043-1-and
 
 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
 +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
-@@ -961,12 +961,6 @@ static void vop2_enable(struct vop2 *vop
+@@ -970,12 +970,6 @@ static void vop2_enable(struct vop2 *vop
  		return;
  	}
  
@@ -48,7 +48,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20231217084415.2373043-1-and
  	if (vop2->data->soc_id == 3566)
  		vop2_writel(vop2, RK3568_OTP_WIN_EN, 1);
  
-@@ -998,6 +992,8 @@ static void vop2_disable(struct vop2 *vo
+@@ -1007,6 +1001,8 @@ static void vop2_disable(struct vop2 *vo
  
  	pm_runtime_put_sync(vop2->dev);
  
diff --git a/target/linux/rockchip/patches-6.6/033-31-v6.8-drm-rockchip-vop2-clean-up-some-inconsistent-indenting.patch b/target/linux/rockchip/patches-6.6/033-31-v6.8-drm-rockchip-vop2-clean-up-some-inconsistent-indenting.patch
index 6272c4ea8b..dd3518f41c 100644
--- a/target/linux/rockchip/patches-6.6/033-31-v6.8-drm-rockchip-vop2-clean-up-some-inconsistent-indenting.patch
+++ b/target/linux/rockchip/patches-6.6/033-31-v6.8-drm-rockchip-vop2-clean-up-some-inconsistent-indenting.patch
@@ -18,7 +18,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20231219062635.100718-1-jiap
 
 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
 +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
-@@ -1703,8 +1703,8 @@ static unsigned long rk3588_calc_cru_cfg
+@@ -1712,8 +1712,8 @@ static unsigned long rk3588_calc_cru_cfg
  		 * *if_pixclk_div = dclk_rate / if_pixclk_rate;
  		 * *if_dclk_div = dclk_rate / if_dclk_rate;
  		 */
diff --git a/target/linux/rockchip/patches-6.6/033-32-v6.8-drm-rockchip-vop2-Drop-superfluous-include.patch b/target/linux/rockchip/patches-6.6/033-32-v6.8-drm-rockchip-vop2-Drop-superfluous-include.patch
index de34da6c06..de582bafd7 100644
--- a/target/linux/rockchip/patches-6.6/033-32-v6.8-drm-rockchip-vop2-Drop-superfluous-include.patch
+++ b/target/linux/rockchip/patches-6.6/033-32-v6.8-drm-rockchip-vop2-Drop-superfluous-include.patch
@@ -15,9 +15,9 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20240104143951.85219-1-crist
 
 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
 +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
-@@ -35,7 +35,6 @@
+@@ -34,7 +34,6 @@
+ #include <dt-bindings/soc/rockchip,vop2.h>
  
- #include "rockchip_drm_drv.h"
  #include "rockchip_drm_gem.h"
 -#include "rockchip_drm_fb.h"
  #include "rockchip_drm_vop2.h"
diff --git a/target/linux/rockchip/patches-6.6/033-33-v6.8-drm-rockchip-vop2-Drop-unused-if_dclk_rate-variable.patch b/target/linux/rockchip/patches-6.6/033-33-v6.8-drm-rockchip-vop2-Drop-unused-if_dclk_rate-variable.patch
index 16c4adac6a..d5ba1043c7 100644
--- a/target/linux/rockchip/patches-6.6/033-33-v6.8-drm-rockchip-vop2-Drop-unused-if_dclk_rate-variable.patch
+++ b/target/linux/rockchip/patches-6.6/033-33-v6.8-drm-rockchip-vop2-Drop-unused-if_dclk_rate-variable.patch
@@ -27,7 +27,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20240105174007.98054-1-crist
 
 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
 +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
-@@ -1682,7 +1682,6 @@ static unsigned long rk3588_calc_cru_cfg
+@@ -1691,7 +1691,6 @@ static unsigned long rk3588_calc_cru_cfg
  	unsigned long dclk_core_rate = v_pixclk >> 2;
  	unsigned long dclk_rate = v_pixclk;
  	unsigned long dclk_out_rate;
@@ -35,7 +35,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20240105174007.98054-1-crist
  	unsigned long if_pixclk_rate;
  	int K = 1;
  
-@@ -1697,8 +1696,8 @@ static unsigned long rk3588_calc_cru_cfg
+@@ -1706,8 +1705,8 @@ static unsigned long rk3588_calc_cru_cfg
  		}
  
  		if_pixclk_rate = (dclk_core_rate << 1) / K;
diff --git a/target/linux/rockchip/patches-6.6/033-34-v6.8-drm-rockchip-vop2-add-a-missing-unlock-in.patch b/target/linux/rockchip/patches-6.6/033-34-v6.8-drm-rockchip-vop2-add-a-missing-unlock-in.patch
index 5316851985..d851946d84 100644
--- a/target/linux/rockchip/patches-6.6/033-34-v6.8-drm-rockchip-vop2-add-a-missing-unlock-in.patch
+++ b/target/linux/rockchip/patches-6.6/033-34-v6.8-drm-rockchip-vop2-add-a-missing-unlock-in.patch
@@ -17,7 +17,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20240119190841.1619443-1-har
 
 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
 +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
-@@ -1987,8 +1987,10 @@ static void vop2_crtc_atomic_enable(stru
+@@ -1996,8 +1996,10 @@ static void vop2_crtc_atomic_enable(stru
  		clock = vop2_set_intf_mux(vp, rkencoder->crtc_endpoint_id, polflags);
  	}
  
diff --git a/target/linux/rockchip/patches-6.6/600-ethernet-stmmac-Add-property-to-disable-VLAN-hw-filter.patch b/target/linux/rockchip/patches-6.6/600-ethernet-stmmac-Add-property-to-disable-VLAN-hw-filter.patch
index 92810e0e14..c595dbb390 100644
--- a/target/linux/rockchip/patches-6.6/600-ethernet-stmmac-Add-property-to-disable-VLAN-hw-filter.patch
+++ b/target/linux/rockchip/patches-6.6/600-ethernet-stmmac-Add-property-to-disable-VLAN-hw-filter.patch
@@ -35,7 +35,7 @@ Signed-off-by: jensen <jensenhuang@friendlyarm.com>
  
 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
 +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
-@@ -7542,7 +7542,7 @@ int stmmac_dvr_probe(struct device *devi
+@@ -7572,7 +7572,7 @@ int stmmac_dvr_probe(struct device *devi
  #ifdef STMMAC_VLAN_TAG_USED
  	/* Both mac100 and gmac support receive VLAN tag detection */
  	ndev->features |= NETIF_F_HW_VLAN_CTAG_RX | NETIF_F_HW_VLAN_STAG_RX;
diff --git a/target/linux/rockchip/patches-6.6/603-net-ethernet-stmmac-add-devname-configuration-from-OF.patch b/target/linux/rockchip/patches-6.6/603-net-ethernet-stmmac-add-devname-configuration-from-OF.patch
index 5a617cca32..02455bc174 100644
--- a/target/linux/rockchip/patches-6.6/603-net-ethernet-stmmac-add-devname-configuration-from-OF.patch
+++ b/target/linux/rockchip/patches-6.6/603-net-ethernet-stmmac-add-devname-configuration-from-OF.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
 +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
-@@ -7368,6 +7368,7 @@ int stmmac_dvr_probe(struct device *devi
+@@ -7398,6 +7398,7 @@ int stmmac_dvr_probe(struct device *devi
  {
  	struct net_device *ndev = NULL;
  	struct stmmac_priv *priv;
@@ -8,7 +8,7 @@
  	u32 rxq;
  	int i, ret = 0;
  
-@@ -7376,6 +7377,9 @@ int stmmac_dvr_probe(struct device *devi
+@@ -7406,6 +7407,9 @@ int stmmac_dvr_probe(struct device *devi
  	if (!ndev)
  		return -ENOMEM;