diff -Nuar linux-meson-mx-integration-6.7-20231203/arch/arm/boot/dts/amlogic/Makefile linux-6.7-rc4-20231203/arch/arm/boot/dts/amlogic/Makefile
--- linux-meson-mx-integration-6.7-20231203/arch/arm/boot/dts/amlogic/Makefile	2023-12-03 07:33:17.000000000 -0500
+++ linux-6.7-rc4-20231203/arch/arm/boot/dts/amlogic/Makefile	2023-12-12 17:57:10.692245329 -0500
@@ -7,7 +7,7 @@
 	meson8b-ec100.dtb \
 	meson8b-mxq.dtb \
 	meson8b-odroidc1.dtb \
-	meson8m2-m8s.dts \
-	meson8m2-mxiii.dts \
+	meson8m2-m8s.dtb \
+	meson8m2-mxiii.dtb \
 	meson8m2-mxiii-plus.dtb \
 	meson8m2-wetek-core.dtb
diff -Nuar linux-meson-mx-integration-6.7-20231203/drivers/gpu/drm/meson/meson_drv.c linux-6.7-rc4-20231203/drivers/gpu/drm/meson/meson_drv.c
--- linux-meson-mx-integration-6.7-20231203/drivers/gpu/drm/meson/meson_drv.c	2023-12-03 07:33:17.000000000 -0500
+++ linux-6.7-rc4-20231203/drivers/gpu/drm/meson/meson_drv.c	2023-12-12 17:20:19.948601849 -0500
@@ -507,7 +507,11 @@
 		goto exit_afbcd;
 
 	if (has_components) {
+#if (1)
+		ret = component_bind_all(drm->dev, drm);
+#else
 		ret = component_bind_all(dev, drm);
+#endif
 		if (ret) {
 			dev_err(drm->dev, "Couldn't bind all components\n");
 			/* Do not try to unbind */
@@ -573,7 +577,11 @@
 	meson_encoder_cvbs_remove(priv);
 
 	if (has_components)
+#if (1)
+		component_unbind_all(drm->dev, drm);
+#else
 		component_unbind_all(dev, drm);
+#endif
 
 	return ret;
 }
@@ -605,7 +613,11 @@
 	meson_encoder_hdmi_remove(priv);
 	meson_encoder_cvbs_remove(priv);
 
+#if (1)
+	component_unbind_all(drm->dev, drm);
+#else
 	component_unbind_all(dev, drm);
+#endif
 
 	if (priv->afbcd.ops)
 		priv->afbcd.ops->exit(priv);
@@ -672,6 +684,10 @@
 	{ .compatible = "amlogic,meson-gxl-dw-hdmi" },
 	{ .compatible = "amlogic,meson-gxm-dw-hdmi" },
 	{ .compatible = "amlogic,meson-g12a-dw-hdmi" },
+#if (1)
+	{ .compatible = "amlogic,meson8-hdmi-tx" },
+	{ .compatible = "amlogic,meson8b-hdmi-tx" },
+#endif
 	{}
 };
 
diff -Nuar linux-meson-mx-integration-6.7-20231203/drivers/gpu/drm/meson/meson_plane.c linux-6.7-rc4-20231203/drivers/gpu/drm/meson/meson_plane.c
--- linux-meson-mx-integration-6.7-20231203/drivers/gpu/drm/meson/meson_plane.c	2023-12-03 07:33:17.000000000 -0500
+++ linux-6.7-rc4-20231203/drivers/gpu/drm/meson/meson_plane.c	2023-12-12 17:21:18.108687141 -0500
@@ -483,6 +483,10 @@
 static const uint32_t supported_drm_formats_m8[] = {
 	DRM_FORMAT_ARGB8888,
 	DRM_FORMAT_ABGR8888,
+#if (1) /* Format supported on some M8 and M8M2 and not just GX */
+	DRM_FORMAT_XRGB8888,
+	DRM_FORMAT_XBGR8888,
+#endif
 	DRM_FORMAT_RGB888,
 	DRM_FORMAT_RGB565,
 };