diff --git a/arch/arm64/boot/dts/apple/t600x-die0.dtsi b/arch/arm64/boot/dts/apple/t600x-die0.dtsi
index 637e052e5db3c3..1be41d6ff5fca7 100644
--- a/arch/arm64/boot/dts/apple/t600x-die0.dtsi
+++ b/arch/arm64/boot/dts/apple/t600x-die0.dtsi
@@ -525,6 +525,7 @@
 			<0x3 0x8b344000 0x0 0x4000>,
 			<0x3 0x8b800000 0x0 0x800000>;
 		apple,bw-scratch = <&pmgr_dcp 0 4 0x988>;
+		apple,iomfb-surfaces = <1 1 0 0>;
 		#ifdef APPLE_USE_PMP
 		power-domains = <&pmp_report_disp0>;
 		#else
diff --git a/arch/arm64/boot/dts/apple/t600x-dieX.dtsi b/arch/arm64/boot/dts/apple/t600x-dieX.dtsi
index e222d63b37d320..e48065b70e0b97 100644
--- a/arch/arm64/boot/dts/apple/t600x-dieX.dtsi
+++ b/arch/arm64/boot/dts/apple/t600x-dieX.dtsi
@@ -103,6 +103,7 @@
 			<0x2 0x89344000 0x0 0x4000>,
 			<0x2 0x89800000 0x0 0x800000>;
 		apple,bw-scratch = <&pmgr_dcp 0 4 0x990>;
+		apple,iomfb-surfaces = <1 1 0 0>;
 		#ifdef APPLE_USE_PMP
 		power-domains = <&DIE_NODE(pmp_report_dispext0)>;
 		#else
@@ -184,6 +185,7 @@
 			<0x2 0x8c344000 0x0 0x4000>,
 			<0x2 0x8c800000 0x0 0x800000>;
 		apple,bw-scratch = <&pmgr_dcp 0 4 0x998>;
+		apple,iomfb-surfaces = <1 1 0 0>;
 		#ifdef APPLE_USE_PMP
 		power-domains = <&DIE_NODE(pmp_report_dispext1)>;
 		#else
diff --git a/arch/arm64/boot/dts/apple/t602x-die0.dtsi b/arch/arm64/boot/dts/apple/t602x-die0.dtsi
index 8938dd90693c4d..852b33a88b8136 100644
--- a/arch/arm64/boot/dts/apple/t602x-die0.dtsi
+++ b/arch/arm64/boot/dts/apple/t602x-die0.dtsi
@@ -624,6 +624,7 @@
 			<0x3 0x89344000 0x0 0x4000>,
 			<0x3 0x89800000 0x0 0x800000>;
 		apple,bw-scratch = <&pmgr_dcp 0 4 0x1208>;
+		apple,iomfb-surfaces = <1 1 0 1>;
 		#ifdef APPLE_USE_PMP
 		power-domains = <&pmp_report_disp0>;
 		#else
diff --git a/arch/arm64/boot/dts/apple/t602x-dieX.dtsi b/arch/arm64/boot/dts/apple/t602x-dieX.dtsi
index d916c0b106d109..13eb09067c4109 100644
--- a/arch/arm64/boot/dts/apple/t602x-dieX.dtsi
+++ b/arch/arm64/boot/dts/apple/t602x-dieX.dtsi
@@ -102,6 +102,7 @@
 			<0x2 0x89344000 0x0 0x4000>,
 			<0x2 0x89800000 0x0 0x800000>;
 		apple,bw-scratch = <&pmgr_dcp 0 4 0x1210>;
+		apple,iomfb-surfaces = <1 1 0 1>;
 		#ifdef APPLE_USE_PMP
 		power-domains = <&DIE_NODE(pmp_report_dispext0)>;
 		#else
@@ -254,6 +255,7 @@
 			<0x3 0x15344000 0x0 0x4000>,
 			<0x3 0x15800000 0x0 0x800000>;
 		apple,bw-scratch = <&pmgr_dcp 0 4 0x1218>;
+		apple,iomfb-surfaces = <1 1 0 1>;
 		#ifdef APPLE_USE_PMP
 		power-domains = <&DIE_NODE(pmp_report_dispext1)>;
 		#else
diff --git a/arch/arm64/boot/dts/apple/t8103.dtsi b/arch/arm64/boot/dts/apple/t8103.dtsi
index dfb5f737a420b3..58c59075f2d2b7 100644
--- a/arch/arm64/boot/dts/apple/t8103.dtsi
+++ b/arch/arm64/boot/dts/apple/t8103.dtsi
@@ -659,6 +659,7 @@
 				<0x2 0x3b3d0000 0x0 0x4000>;
 			apple,bw-scratch = <&pmgr_dcp 0 5 0x14>;
 			apple,bw-doorbell = <&pmgr_dcp 1 6>;
+			apple,iomfb-surfaces = <1 1 0 0>;
 			power-domains = <&ps_disp0_cpu0>;
 			resets = <&ps_disp0_cpu0>;
 			clocks = <&clk_disp0>;
@@ -1485,6 +1486,7 @@
 			      <0x2 0x3b3d0000 0x0 0x4000>;
 			apple,bw-scratch = <&pmgr_dcp 0 5 0x18>;
 			apple,bw-doorbell = <&pmgr_dcp 1 6>;
+			apple,iomfb-surfaces = <1 1 0 0>;
 			power-domains = <&ps_dispext_cpu0>;
 			resets = <&ps_dispext_cpu0>;
 			clocks = <&clk_dispext0>;
diff --git a/arch/arm64/boot/dts/apple/t8112.dtsi b/arch/arm64/boot/dts/apple/t8112.dtsi
index b19b94305e47c1..1215de82221d5d 100644
--- a/arch/arm64/boot/dts/apple/t8112.dtsi
+++ b/arch/arm64/boot/dts/apple/t8112.dtsi
@@ -748,6 +748,7 @@
 				<0x2 0x31344000 0x0 0x4000>,
 				<0x2 0x31800000 0x0 0x800000>;
 			apple,bw-scratch = <&pmgr_dcp 0 4 0x5d8>;
+			apple,iomfb-surfaces = <1 1 0 1>;
 			#ifdef APPLE_USE_PMP
 			power-domains = <&pmp_report_disp0>;
 			#else
@@ -1745,6 +1746,7 @@
 			      <0x2 0x71344000 0x0 0x4000>,
 			      <0x2 0x71800000 0x0 0x800000>;
 			apple,bw-scratch = <&pmgr_dcp 0 4 0x5e0>;
+			apple,iomfb-surfaces = <1 1 0 1>;
 			#ifdef APPLE_USE_PMP
 			power-domains = <&pmp_report_dispext>;
 			#else
diff --git a/drivers/gpu/drm/apple/Makefile b/drivers/gpu/drm/apple/Makefile
index b22839bdd611a7..c64f8ee2071db3 100644
--- a/drivers/gpu/drm/apple/Makefile
+++ b/drivers/gpu/drm/apple/Makefile
@@ -8,8 +8,8 @@ appledrm-$(CONFIG_DRM_APPLE_AUDIO) += audio.o
 appledrm-$(CONFIG_DRM_APPLE_AUDIO) += av.o
 appledrm-y += connector.o
 appledrm-y += ibootep.o
-appledrm-y += iomfb_v12_3.o
 appledrm-y += iomfb_v13_3.o
+appledrm-y += iomfb_v14_8_3.o
 appledrm-y += epic/dpavservep.o
 appledrm-y += plane.o
 
diff --git a/drivers/gpu/drm/apple/apple_drv.c b/drivers/gpu/drm/apple/apple_drv.c
index 0f36dad6f96351..ddaa4415fde0b0 100644
--- a/drivers/gpu/drm/apple/apple_drv.c
+++ b/drivers/gpu/drm/apple/apple_drv.c
@@ -272,31 +272,25 @@ static int apple_probe_per_dcp(struct device *dev,
 	struct apple_crtc *crtc;
 	struct apple_connector *connector;
 	struct apple_encoder *enc;
-	struct drm_plane *planes[DCP_MAX_PLANES];
+	struct apple_plane *planes[DCP_MAX_PLANES];
+	struct apple_dcp *drv = platform_get_drvdata(dcp);
 	int ret, i;
-	int immutable_zpos = 0;
-	bool supports_l10r = !dcp_fw_compat_is_12_x(dcp);
-
-	planes[0] = apple_plane_init(drm, 1U << num, supports_l10r,
-				     DRM_PLANE_TYPE_PRIMARY);
-	if (IS_ERR(planes[0]))
-		return PTR_ERR(planes[0]);
-	ret = drm_plane_create_zpos_immutable_property(planes[0], immutable_zpos);
-	if (ret) {
-		return ret;
-	}
-
-
-	/* Set up our other planes */
-	for (i = 1; i < DCP_MAX_PLANES; i++) {
-		planes[i] = apple_plane_init(drm, 1U << num, supports_l10r,
-					     DRM_PLANE_TYPE_OVERLAY);
-		if (IS_ERR(planes[i]))
-			return PTR_ERR(planes[i]);
-		immutable_zpos++;
-		ret = drm_plane_create_zpos_immutable_property(planes[i], immutable_zpos);
-		if (ret) {
-			return ret;
+	int zpos = 0;
+	bool supports_l10r = true;
+
+	for (i = 0; i < DCP_MAX_PLANES; i++) {
+		if (drv->iomfb_surfaces[i]) {
+			planes[zpos] = apple_plane_init(drm, 1U << num, supports_l10r,
+							zpos ? DRM_PLANE_TYPE_OVERLAY : DRM_PLANE_TYPE_PRIMARY);
+			if (IS_ERR(planes[zpos]))
+				return PTR_ERR(planes[zpos]);
+
+			ret = drm_plane_create_zpos_immutable_property(&planes[zpos]->base, zpos);
+			if (ret)
+				return ret;
+
+			planes[zpos]->iomfb_surf = i;
+			zpos++;
 		}
 	}
 
@@ -307,7 +301,7 @@ static int apple_probe_per_dcp(struct device *dev,
 	 * knows what to do with overlays.
 	 */
 	crtc = kzalloc(sizeof(*crtc), GFP_KERNEL);
-	ret = drm_crtc_init_with_planes(drm, &crtc->base, planes[0], NULL,
+	ret = drm_crtc_init_with_planes(drm, &crtc->base, &planes[0]->base, NULL,
 					&apple_crtc_funcs, NULL);
 	if (ret)
 		return ret;
diff --git a/drivers/gpu/drm/apple/av.c b/drivers/gpu/drm/apple/av.c
index 0d3c752f62d5f5..4a951d5800d708 100644
--- a/drivers/gpu/drm/apple/av.c
+++ b/drivers/gpu/drm/apple/av.c
@@ -30,17 +30,6 @@ struct dcp_av_audio_cmds {
 	u32 get_product_attrs;
 };
 
-static const struct dcp_av_audio_cmds dcp_av_audio_cmds_v12_3 = {
-	.open = 6,
-	.close = 7,
-	.prepare = 8,
-	.start_link = 9,
-	.stop_link = 12,
-	.unprepare = 13,
-	.get_elements = 18,
-	.get_product_attrs = 20,
-};
-
 static const struct dcp_av_audio_cmds dcp_av_audio_cmds_v13_5 = {
 	.open = 4,
 	.close = 5,
@@ -389,10 +378,8 @@ int avep_init(struct apple_dcp *dcp)
 	mutex_init(&audiosrv_data->plug_lock);
 
 	switch (dcp->fw_compat) {
-	case DCP_FIRMWARE_V_12_3:
-		audiosrv_data->cmds = dcp_av_audio_cmds_v12_3;
-		break;
 	case DCP_FIRMWARE_V_13_5:
+	case DCP_FIRMWARE_V_14_7:
 		audiosrv_data->cmds = dcp_av_audio_cmds_v13_5;
 		break;
 	default:
diff --git a/drivers/gpu/drm/apple/dcp-internal.h b/drivers/gpu/drm/apple/dcp-internal.h
index f2eb2483c9a880..f89758a9964920 100644
--- a/drivers/gpu/drm/apple/dcp-internal.h
+++ b/drivers/gpu/drm/apple/dcp-internal.h
@@ -16,23 +16,18 @@
 
 #include "dptxep.h"
 #include "iomfb.h"
-#include "iomfb_v12_3.h"
 #include "iomfb_v13_3.h"
+#include "iomfb_v14_8_3.h"
 #include "epic/dpavservep.h"
+#include "version_utils.h"
 
-#define DCP_MAX_PLANES 2
+#define DCP_MAX_PLANES 4
 
 struct apple_dcp;
 struct apple_dcp_afkep;
 
 struct dcpav_service_epic;
 
-enum dcp_firmware_version {
-	DCP_FIRMWARE_UNKNOWN,
-	DCP_FIRMWARE_V_12_3,
-	DCP_FIRMWARE_V_13_5,
-};
-
 enum {
 	SYSTEM_ENDPOINT = 0x20,
 	TEST_ENDPOINT = 0x21,
@@ -138,6 +133,8 @@ struct apple_dcp {
 	 * sense to keep some of the members in apple_dcp.                    *
 	 **********************************************************************/
 
+	u32 iomfb_surfaces[DCP_MAX_PLANES];
+
 	/* clock rate request by dcp in */
 	struct clk *clk;
 
@@ -174,8 +171,8 @@ struct apple_dcp {
 
 	/* Queued swap. Owned by the DCP to avoid per-swap memory allocation */
 	union {
-		struct dcp_swap_submit_req_v12_3 v12_3;
 		struct dcp_swap_submit_req_v13_3 v13_3;
+		struct dcp_swap_submit_req_v14_7_0 v14_7_0;
 	} swap;
 
 	/* swap id of the last completed swap */
diff --git a/drivers/gpu/drm/apple/dcp.c b/drivers/gpu/drm/apple/dcp.c
index 9dfc3fd002f530..8ce6b7d403e822 100644
--- a/drivers/gpu/drm/apple/dcp.c
+++ b/drivers/gpu/drm/apple/dcp.c
@@ -331,10 +331,7 @@ int dcp_crtc_atomic_check(struct drm_crtc *crtc, struct drm_atomic_state *state)
 {
 	struct platform_device *pdev = to_apple_crtc(crtc)->dcp;
 	struct apple_dcp *dcp = platform_get_drvdata(pdev);
-	struct drm_plane_state *new_state;
-	struct drm_plane *plane;
 	struct drm_crtc_state *crtc_state;
-	int plane_idx, plane_count = 0;
 	bool needs_modeset;
 
 	if (dcp->crashed)
@@ -348,19 +345,6 @@ int dcp_crtc_atomic_check(struct drm_crtc *crtc, struct drm_atomic_state *state)
 		return -EINVAL;
 	}
 
-	for_each_new_plane_in_state(state, plane, new_state, plane_idx) {
-		/* skip planes not for this crtc */
-		if (new_state->crtc != crtc)
-			continue;
-
-		plane_count += 1;
-	}
-
-	if (plane_count > DCP_MAX_PLANES) {
-		dev_err(dcp->dev, "crtc_atomic_check: Blend supports only 2 layers!\n");
-		return -EINVAL;
-	}
-
 	return 0;
 }
 
@@ -501,14 +485,6 @@ void dcp_link(struct platform_device *pdev, struct apple_crtc *crtc,
 	dcp->connector = connector;
 }
 
-
-bool dcp_fw_compat_is_12_x(struct platform_device *pdev)
-{
-	struct apple_dcp *dcp = platform_get_drvdata(pdev);
-
-	return dcp->fw_compat == DCP_FIRMWARE_V_12_3;
-}
-
 int dcp_start(struct platform_device *pdev)
 {
 	struct apple_dcp *dcp = platform_get_drvdata(pdev);
@@ -584,12 +560,12 @@ int dcp_start(struct platform_device *pdev)
 static void _dcp_poweroff(struct apple_dcp *dcp)
 {
 	switch (dcp->fw_compat) {
-	case DCP_FIRMWARE_V_12_3:
-		iomfb_poweroff_v12_3(dcp);
-		break;
 	case DCP_FIRMWARE_V_13_5:
 		iomfb_poweroff_v13_3(dcp);
 		break;
+	case DCP_FIRMWARE_V_14_7:
+		iomfb_poweroff_v14_7_0(dcp);
+		break;
 	default:
 		WARN_ONCE(true, "Unexpected firmware version: %u\n", dcp->fw_compat);
 		break;
@@ -643,12 +619,12 @@ int dcp_wait_ready(struct platform_device *pdev, u64 timeout)
 static void __maybe_unused dcp_sleep(struct apple_dcp *dcp)
 {
 	switch (dcp->fw_compat) {
-	case DCP_FIRMWARE_V_12_3:
-		iomfb_sleep_v12_3(dcp);
-		break;
 	case DCP_FIRMWARE_V_13_5:
 		iomfb_sleep_v13_3(dcp);
 		break;
+	case DCP_FIRMWARE_V_14_7:
+		iomfb_sleep_v14_7_0(dcp);
+		break;
 	default:
 		WARN_ONCE(true, "Unexpected firmware version: %u\n", dcp->fw_compat);
 		break;
@@ -668,12 +644,12 @@ void dcp_poweron(struct platform_device *pdev)
 	}
 
 	switch (dcp->fw_compat) {
-	case DCP_FIRMWARE_V_12_3:
-		iomfb_poweron_v12_3(dcp);
-		break;
 	case DCP_FIRMWARE_V_13_5:
 		iomfb_poweron_v13_3(dcp);
 		break;
+	case DCP_FIRMWARE_V_14_7:
+		iomfb_poweron_v14_7_0(dcp);
+		break;
 	default:
 		WARN_ONCE(true, "Unexpected firmware version: %u\n", dcp->fw_compat);
 		break;
@@ -959,8 +935,6 @@ static enum dcp_firmware_version dcp_check_firmware_version(struct device *dev)
 		return DCP_FIRMWARE_UNKNOWN;
 	}
 
-	if (strncmp(compat_str, "12.3.0", sizeof(compat_str)) == 0)
-		return DCP_FIRMWARE_V_12_3;
 	/*
 	 * m1n1 reports firmware version 13.5 as compatible with 13.3. This is
 	 * only true for the iomfb endpoint. The interface for the dptx-port
@@ -973,6 +947,9 @@ static enum dcp_firmware_version dcp_check_firmware_version(struct device *dev)
 		return DCP_FIRMWARE_V_13_5;
 	else if (strncmp(compat_str, "13.5.0", sizeof(compat_str)) == 0)
 		return DCP_FIRMWARE_V_13_5;
+	else if (strncmp(compat_str, "14.7.0", sizeof(compat_str)) == 0 &&
+		(strncmp(fw_str, "14.7.0", sizeof(compat_str)) == 0))
+		return DCP_FIRMWARE_V_14_7;
 
 	dev_err(dev, "DCP firmware-compat %s (FW: %s) is not supported\n",
 		compat_str, fw_str);
@@ -1194,6 +1171,11 @@ static int dcp_platform_probe(struct platform_device *pdev)
 		dev_err(dev, "Failed to get dp-phy: %ld\n", PTR_ERR(dcp->phy));
 		return PTR_ERR(dcp->phy);
 	}
+
+	if (of_property_read_u32_array(dev->of_node, "apple,iomfb-surfaces",
+				       (u32 *)&dcp->iomfb_surfaces, DCP_MAX_PLANES))
+		dcp->iomfb_surfaces[0] = 1;
+
 	if (dcp->phy) {
 		int ret;
 		/*
diff --git a/drivers/gpu/drm/apple/iomfb.c b/drivers/gpu/drm/apple/iomfb.c
index 1d9448f0f4dc47..1eb71c1d85eaaf 100644
--- a/drivers/gpu/drm/apple/iomfb.c
+++ b/drivers/gpu/drm/apple/iomfb.c
@@ -430,12 +430,12 @@ int dcp_crtc_atomic_modeset(struct drm_crtc *crtc,
 		return 0;
 
 	switch (dcp->fw_compat) {
-	case DCP_FIRMWARE_V_12_3:
-		ret = iomfb_modeset_v12_3(dcp, crtc_state);
-		break;
 	case DCP_FIRMWARE_V_13_5:
 		ret = iomfb_modeset_v13_3(dcp, crtc_state);
 		break;
+	case DCP_FIRMWARE_V_14_7:
+		ret = iomfb_modeset_v14_7_0(dcp, crtc_state);
+		break;
 	default:
 		WARN_ONCE(true, "Unexpected firmware version: %u\n",
 			  dcp->fw_compat);
@@ -479,12 +479,12 @@ void dcp_flush(struct drm_crtc *crtc, struct drm_atomic_state *state)
 	}
 
 	switch (dcp->fw_compat) {
-	case DCP_FIRMWARE_V_12_3:
-		iomfb_flush_v12_3(dcp, crtc, state);
-		break;
 	case DCP_FIRMWARE_V_13_5:
 		iomfb_flush_v13_3(dcp, crtc, state);
 		break;
+	case DCP_FIRMWARE_V_14_7:
+		iomfb_flush_v14_7_0(dcp, crtc, state);
+		break;
 	default:
 		WARN_ONCE(true, "Unexpected firmware version: %u\n", dcp->fw_compat);
 		break;
@@ -494,12 +494,12 @@ void dcp_flush(struct drm_crtc *crtc, struct drm_atomic_state *state)
 static void iomfb_start(struct apple_dcp *dcp)
 {
 	switch (dcp->fw_compat) {
-	case DCP_FIRMWARE_V_12_3:
-		iomfb_start_v12_3(dcp);
-		break;
 	case DCP_FIRMWARE_V_13_5:
 		iomfb_start_v13_3(dcp);
 		break;
+	case DCP_FIRMWARE_V_14_7:
+		iomfb_start_v14_7_0(dcp);
+		break;
 	default:
 		WARN_ONCE(true, "Unexpected firmware version: %u\n", dcp->fw_compat);
 		break;
@@ -545,12 +545,12 @@ void iomfb_shutdown(struct apple_dcp *dcp)
 	dcp->valid_mode = false;
 
 	switch (dcp->fw_compat) {
-	case DCP_FIRMWARE_V_12_3:
-		iomfb_shutdown_v12_3(dcp);
-		break;
 	case DCP_FIRMWARE_V_13_5:
 		iomfb_shutdown_v13_3(dcp);
 		break;
+	case DCP_FIRMWARE_V_14_7:
+		iomfb_shutdown_v14_7_0(dcp);
+		break;
 	default:
 		WARN_ONCE(true, "Unexpected firmware version: %u\n", dcp->fw_compat);
 		break;
diff --git a/drivers/gpu/drm/apple/iomfb.h b/drivers/gpu/drm/apple/iomfb.h
index 8a871db0b94a70..531089dab63134 100644
--- a/drivers/gpu/drm/apple/iomfb.h
+++ b/drivers/gpu/drm/apple/iomfb.h
@@ -78,7 +78,8 @@ struct dcp_packet_header {
 #define DCP_PACKET_ALIGNMENT (0x40)
 
 enum iomfb_property_id {
-    IOMFB_PROPERTY_NITS = 15, // divide by Brightness_Scale
+    IOMFB_PROPERTY_NITS_V13_3 = 15, // divide by Brightness_Scale
+    IOMFB_PROPERTY_NITS_V14_7 = 19,
 };
 
 #define IOMFB_BRIGHTNESS_MIN 0x10000000
@@ -86,8 +87,6 @@ enum iomfb_property_id {
 /* Structures used in v12.0 firmware */
 
 #define SWAP_SURFACES 4
-/* We have 4 surfaces, but we can only ever blend two */
-#define MAX_BLEND_SURFACES 2
 
 struct dcp_iouserclient {
 	/* Handle for the IOUserClient. macOS sets this to a kernel VA. */
diff --git a/drivers/gpu/drm/apple/iomfb_plane.h b/drivers/gpu/drm/apple/iomfb_plane.h
index 0701978200311a..73f104059d29cc 100644
--- a/drivers/gpu/drm/apple/iomfb_plane.h
+++ b/drivers/gpu/drm/apple/iomfb_plane.h
@@ -67,7 +67,9 @@ struct dcp_plane_info {
 	u16 tile_size;
 	u8 tile_w;
 	u8 tile_h;
-	u32 unk[13];
+	u8 unk[0xd];
+	u8 unk2;
+	u8 unk3[0x26];
 } __packed;
 
 struct dcp_component_types {
@@ -75,6 +77,23 @@ struct dcp_component_types {
 	u8 types[7];
 } __packed;
 
+struct dcp_compression_info {
+	u32 tile_w;
+	u32 tile_h;
+	u32 metadata_offset;
+	u32 data_offset;
+	u32 meta_bytes;
+	u32 tiles_w;
+	u32 tiles_h;
+	u32 unk_1;
+	u32 compression_type;
+	u32 unk3;
+	u8 padding[3];
+	u32 tile_bytes;
+	u32 row_stride;
+	u8 pad2;
+} __packed;
+
 /* Information describing a surface */
 struct dcp_surface {
 	u8 is_tiled;
@@ -100,7 +119,7 @@ struct dcp_surface {
 	u64 has_comp;
 	struct dcp_plane_info planes[DCP_SURF_MAX_PLANES];
 	u64 has_planes;
-	u32 compression_info[DCP_SURF_MAX_PLANES][13];
+	struct dcp_compression_info compression_info[DCP_SURF_MAX_PLANES];
 	u64 has_compr_info;
 	u32 unk_num;
 	u32 unk_denom;
diff --git a/drivers/gpu/drm/apple/iomfb_template.c b/drivers/gpu/drm/apple/iomfb_template.c
index 553134aad80c9c..252f1310870b53 100644
--- a/drivers/gpu/drm/apple/iomfb_template.c
+++ b/drivers/gpu/drm/apple/iomfb_template.c
@@ -200,7 +200,8 @@ static bool iomfbep_cb_match_backlight_service(struct apple_dcp *dcp, int tag, v
 static void iomfb_cb_pr_publish(struct apple_dcp *dcp, struct iomfb_property *prop)
 {
 	switch (prop->id) {
-	case IOMFB_PROPERTY_NITS:
+	case IOMFB_PROPERTY_NITS_V13_3:
+	case IOMFB_PROPERTY_NITS_V14_7:
 	{
 		if (dcp_has_panel(dcp)) {
 			dcp->brightness.nits = prop->value / dcp->brightness.scale;
@@ -738,17 +739,17 @@ static void dcp_swap_cleared(struct apple_dcp *dcp, void *data, void *cookie)
 		return;
 	}
 
-	while (!list_empty(&dcp->swapped_out_fbs)) {
-		struct dcp_fb_reference *entry;
-		entry = list_first_entry(&dcp->swapped_out_fbs,
-					 struct dcp_fb_reference, head);
-		if (entry->swap_id == dcp->last_swap_id)
-			break;
-		if (entry->fb)
-			drm_framebuffer_put(entry->fb);
-		list_del(&entry->head);
-		kfree(entry);
-	}
+	// while (!list_empty(&dcp->swapped_out_fbs)) {
+	// 	struct dcp_fb_reference *entry;
+	// 	entry = list_first_entry(&dcp->swapped_out_fbs,
+	// 				 struct dcp_fb_reference, head);
+	// 	if (entry->swap_id == dcp->last_swap_id)
+	// 		break;
+	// 	if (entry->fb)
+	// 		drm_framebuffer_put(entry->fb);
+	// 	list_del(&entry->head);
+	// 	kfree(entry);
+	// }
 }
 
 static void dcp_swap_clear_started(struct apple_dcp *dcp, void *data,
@@ -909,7 +910,11 @@ void DCP_FW_NAME(iomfb_poweroff)(struct apple_dcp *dcp)
 	 * brightness.
 	 */
 	if (dcp_has_panel(dcp)) {
+#if DCP_FW_VER < DCP_FW_VERSION(14, 7, 0)
 		swap->swap.bl_unk = 1;
+#else
+		swap->swap.bl_update = 1;
+#endif
 		swap->swap.bl_value = 0;
 		swap->swap.bl_power = 0;
 	}
@@ -1145,17 +1150,17 @@ static void dcp_swapped(struct apple_dcp *dcp, void *data, void *cookie)
 	}
 	dcp->swap_start = ktime_get();
 
-	while (!list_empty(&dcp->swapped_out_fbs)) {
-		struct dcp_fb_reference *entry;
-		entry = list_first_entry(&dcp->swapped_out_fbs,
-					 struct dcp_fb_reference, head);
-		if (entry->swap_id == dcp->last_swap_id)
-			break;
-		if (entry->fb)
-			drm_framebuffer_put(entry->fb);
-		list_del(&entry->head);
-		kfree(entry);
-	}
+	// while (!list_empty(&dcp->swapped_out_fbs)) {
+	// 	struct dcp_fb_reference *entry;
+	// 	entry = list_first_entry(&dcp->swapped_out_fbs,
+	// 				 struct dcp_fb_reference, head);
+	// 	if (entry->swap_id == dcp->last_swap_id)
+	// 		break;
+	// 	if (entry->fb)
+	// 		drm_framebuffer_put(entry->fb);
+	// 	list_del(&entry->head);
+	// 	kfree(entry);
+	// }
 }
 
 static void dcp_swap_started(struct apple_dcp *dcp, void *data, void *cookie)
@@ -1311,26 +1316,13 @@ void DCP_FW_NAME(iomfb_flush)(struct apple_dcp *dcp, struct drm_crtc *crtc, stru
 
 	for_each_oldnew_plane_in_state(state, plane, old_state, new_state, plane_idx) {
 		struct apple_plane_state *apple_state = to_apple_plane_state(new_state);
+		struct apple_plane *apl_plane = to_apple_plane(plane);
 
 		/* skip planes not for this crtc */
 		if (old_state->crtc != crtc && new_state->crtc != crtc)
 			continue;
 
-		/*
-		 * Plane order is nondeterministic for this iterator. DCP will
-		 * almost always crash at some point if the z order of planes
-		 * flip-flops around. Make sure we are always blending them
-		 * in the correct order.
-		 *
-		 * Despite having 4 surfaces, we can only blend two. Surface 0 is
-		 * also unusable on some machines, so ignore it.
-		 */
-
-		l = MAX_BLEND_SURFACES - new_state->normalized_zpos;
-
-		WARN_ON(l > MAX_BLEND_SURFACES);
-
-		req->swap.swap_enabled |= BIT(l);
+		req->swap.swap_enabled |= BIT(apl_plane->iomfb_surf);
 
 		if (old_state->fb && new_state->fb != old_state->fb) {
 			/*
@@ -1356,17 +1348,19 @@ void DCP_FW_NAME(iomfb_flush)(struct apple_dcp *dcp, struct drm_crtc *crtc, stru
 		if (!new_state->fb || !new_state->visible) {
 			continue;
 		}
-		req->surf_null[l] = false;
+		req->surf_null[apl_plane->iomfb_surf] = false;
 		has_surface = 1;
 
-		req->swap.src_rect[l] = apple_state->src_rect;
-		req->swap.dst_rect[l] = apple_state->dst_rect;
+		req->swap.src_rect[apl_plane->iomfb_surf] = apple_state->src_rect;
+		req->swap.dst_rect[apl_plane->iomfb_surf] = apple_state->dst_rect;
+
+		req->swap.surf_ids[apl_plane->iomfb_surf] = plane->base.id;
 
 		if (dcp->notch_height > 0)
-			req->swap.dst_rect[l].y += dcp->notch_height;
+			req->swap.dst_rect[apl_plane->iomfb_surf].y += dcp->notch_height;
 
-		req->surf_iova[l] = apple_state->iova;
-		req->surf[l].base = apple_state->surf;
+		req->surf_iova[apl_plane->iomfb_surf] = apple_state->iova;
+		req->surf[apl_plane->iomfb_surf].base = apple_state->surf;
 
 		/* Use sRGB colorspace only for internal panels. External
 		 * displays are expected to have EDID and user space can use
@@ -1374,8 +1368,8 @@ void DCP_FW_NAME(iomfb_flush)(struct apple_dcp *dcp, struct drm_crtc *crtc, stru
 		 * colors.
 		 */
 		if (dcp->connector_type == DRM_MODE_CONNECTOR_eDP &&
-		    req->surf[l].base.colorspace == DCP_COLORSPACE_BG_SRGB)
-			req->surf[l].base.colorspace = DCP_COLORSPACE_NATIVE;
+		    req->surf[apl_plane->iomfb_surf].base.colorspace == DCP_COLORSPACE_BG_SRGB)
+			req->surf[apl_plane->iomfb_surf].base.colorspace = DCP_COLORSPACE_NATIVE;
 	}
 
 	if (!has_surface && !crtc_state->color_mgmt_changed) {
@@ -1406,7 +1400,11 @@ void DCP_FW_NAME(iomfb_flush)(struct apple_dcp *dcp, struct drm_crtc *crtc, stru
 
 	/* update brightness if changed */
 	if (dcp_has_panel(dcp) && dcp->brightness.update) {
+#if DCP_FW_VER >= DCP_FW_VERSION(14, 7, 0)
+		req->swap.bl_update = 1;
+#else
 		req->swap.bl_unk = 1;
+#endif
 		req->swap.bl_value = dcp->brightness.dac;
 		req->swap.bl_power = 0x40;
 		dcp->brightness.update = false;
diff --git a/drivers/gpu/drm/apple/iomfb_template.h b/drivers/gpu/drm/apple/iomfb_template.h
index 8efab49cc53d08..3e1ee3b58ae32b 100644
--- a/drivers/gpu/drm/apple/iomfb_template.h
+++ b/drivers/gpu/drm/apple/iomfb_template.h
@@ -30,7 +30,9 @@ struct DCP_FW_NAME(dcp_swap) {
 
 	u64 flags1;
 	u64 flags2;
-
+#if DCP_FW_VER >= DCP_FW_VERSION(14, 7, 0)
+	u8 unk_v14_7[0x48];
+#endif
 	u32 swap_id;
 
 	u32 surf_ids[SWAP_SURFACES];
@@ -42,22 +44,41 @@ struct DCP_FW_NAME(dcp_swap) {
 	u32 swap_completed;
 
 	u32 bg_color;
-	u8 unk_110[0x1b8];
+	u8 unk_110[0x30];
+	u32 active_region_en[SWAP_SURFACES];
+	struct dcp_rect active_regions[SWAP_SURFACES];
+	u8 unk_190[0x138];
 	u32 unk_2c8;
+#if DCP_FW_VER < DCP_FW_VERSION(14, 7, 0)
 	u8 unk_2cc[0x14];
+#else
+	u8 unk_2cc[0x40];
+#endif
+#if DCP_FW_VER < DCP_FW_VERSION(14, 7, 0)
 	u32 unk_2e0;
+#else
+	u32 bl_update;
+#endif
 #if DCP_FW_VER < DCP_FW_VERSION(13, 2, 0)
 	u16 unk_2e2;
 #else
 	u8 unk_2e2[3];
 #endif
+#if DCP_FW_VER < DCP_FW_VERSION(14, 7 ,0)
 	u64 bl_unk;
+#else
+	u32 bl_unk;
+#endif
 	u32 bl_value; // min value is 0x10000000
 	u8  bl_power; // constant 0x40 for on
 	u8 unk_2f3[0x2d];
 #if DCP_FW_VER >= DCP_FW_VERSION(13, 2, 0)
 	u8 unk_320[0x13f];
-	u64 unk_1;
+#if DCP_FW_VER >= DCP_FW_VERSION(14, 7, 0)
+	u8 unk_14_7_2[0x30];
+#endif
+	u32 unk_flags;
+	u32 unk_flags2;
 #endif
 } __packed;
 
@@ -103,6 +124,12 @@ struct DCP_FW_NAME(dcp_swap_submit_req) {
 	u8 unkU32out_null;
 #endif
 	u8 padding[1];
+#if DCP_FW_VER >= DCP_FW_VERSION(14, 7, 0)
+	u8 padding_14_7[0x1e9];
+	u8 unk_14_7_zero[0x46]
+	u32 unk_14_7_u32;
+	u8 unk_bool;
+#endif
 } __packed;
 
 struct DCP_FW_NAME(dcp_swap_submit_resp) {
diff --git a/drivers/gpu/drm/apple/iomfb_v13_3.c b/drivers/gpu/drm/apple/iomfb_v13_3.c
index 0ac869d24eb01b..a74350b8c930dd 100644
--- a/drivers/gpu/drm/apple/iomfb_v13_3.c
+++ b/drivers/gpu/drm/apple/iomfb_v13_3.c
@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: GPL-2.0-only OR MIT
 /* Copyright The Asahi Linux Contributors */
 
-#include "iomfb_v12_3.h"
 #include "iomfb_v13_3.h"
+#include "iomfb_v14_8_3.h"
 #include "version_utils.h"
 
 static const struct dcp_method_entry dcp_methods[dcpep_num_methods] = {
diff --git a/drivers/gpu/drm/apple/iomfb_v12_3.c b/drivers/gpu/drm/apple/iomfb_v14_8_3.c
similarity index 54%
rename from drivers/gpu/drm/apple/iomfb_v12_3.c
rename to drivers/gpu/drm/apple/iomfb_v14_8_3.c
index 0fe08c42d64659..8e0efbcfbba3b7 100644
--- a/drivers/gpu/drm/apple/iomfb_v12_3.c
+++ b/drivers/gpu/drm/apple/iomfb_v14_8_3.c
@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: GPL-2.0-only OR MIT
 /* Copyright The Asahi Linux Contributors */
 
-#include "iomfb_v12_3.h"
 #include "iomfb_v13_3.h"
+#include "iomfb_v14_8_3.h"
 #include "version_utils.h"
 
 static const struct dcp_method_entry dcp_methods[dcpep_num_methods] = {
@@ -10,29 +10,30 @@ static const struct dcp_method_entry dcp_methods[dcpep_num_methods] = {
 	IOMFB_METHOD("A029", dcpep_setup_video_limits),
 	IOMFB_METHOD("A131", iomfbep_a131_pmu_service_matched),
 	IOMFB_METHOD("A132", iomfbep_a132_backlight_service_matched),
-	IOMFB_METHOD("A357", dcpep_set_create_dfb),
-	IOMFB_METHOD("A358", iomfbep_a358_vi_set_temperature_hint),
+	IOMFB_METHOD("A377", dcpep_set_create_dfb),
+	IOMFB_METHOD("A378", iomfbep_a358_vi_set_temperature_hint),
 	IOMFB_METHOD("A401", dcpep_start_signal),
-	IOMFB_METHOD("A407", dcpep_swap_start),
-	IOMFB_METHOD("A408", dcpep_swap_submit),
-	IOMFB_METHOD("A410", dcpep_set_display_device),
-	IOMFB_METHOD("A411", dcpep_is_main_display),
-	IOMFB_METHOD("A412", dcpep_set_digital_out_mode),
-	IOMFB_METHOD("A422", iomfbep_set_matrix),
-	IOMFB_METHOD("A426", iomfbep_get_color_remap_mode),
-	IOMFB_METHOD("A439", dcpep_set_parameter_dcp),
-	IOMFB_METHOD("A443", dcpep_create_default_fb),
-	IOMFB_METHOD("A447", dcpep_enable_disable_video_power_savings),
-	IOMFB_METHOD("A454", dcpep_first_client_open),
-	IOMFB_METHOD("A455", iomfbep_last_client_close),
-	IOMFB_METHOD("A460", dcpep_set_display_refresh_properties),
-	IOMFB_METHOD("A463", dcpep_flush_supports_power),
-	IOMFB_METHOD("A464", iomfbep_abort_swaps_dcp),
-	IOMFB_METHOD("A468", dcpep_set_power_state),
+	IOMFB_METHOD("A406", dcpep_swap_start),
+	IOMFB_METHOD("A407", dcpep_swap_submit),
+	IOMFB_METHOD("A409", dcpep_set_display_device),
+	IOMFB_METHOD("A410", dcpep_is_main_display),
+	IOMFB_METHOD("A411", dcpep_set_digital_out_mode),
+	IOMFB_METHOD("A421", iomfbep_set_matrix),
+	IOMFB_METHOD("A425", iomfbep_get_color_remap_mode),
+	IOMFB_METHOD("A440", dcpep_set_parameter_dcp),
+	IOMFB_METHOD("A444", dcpep_create_default_fb),
+	IOMFB_METHOD("A443", dcpep_enable_disable_video_power_savings),
+	IOMFB_METHOD("A455", dcpep_first_client_open),
+	IOMFB_METHOD("A457", iomfbep_last_client_close),
+	IOMFB_METHOD("A463", dcpep_set_display_refresh_properties),
+	IOMFB_METHOD("A466", dcpep_flush_supports_power),
+	IOMFB_METHOD("A467", iomfbep_abort_swaps_dcp),
+	//IOMFB_METHOD("A471", dcpep_update_dfb_surface),
+	IOMFB_METHOD("A472", dcpep_set_power_state),
 };
 
-#define DCP_FW v12_3
-#define DCP_FW_VER DCP_FW_VERSION(12, 3, 0)
+#define DCP_FW v14_7_0
+#define DCP_FW_VER DCP_FW_VERSION(14, 7, 0)
 
 #include "iomfb_template.c"
 
@@ -41,29 +42,36 @@ static const iomfb_cb_handler cb_handlers[IOMFB_MAX_CB] = {
 	[1] = trampoline_true, /* did_power_on_signal */
 	[2] = trampoline_nop, /* will_power_off_signal */
 	[3] = trampoline_rt_bandwidth,
+	// [6] = trampoline_set_frame_sync_props,
+	[6] = trampoline_nop,
 	[100] = iomfbep_cb_match_pmu_service,
 	[101] = trampoline_zero, /* get_display_default_stride */
 	[102] = trampoline_nop, /* set_number_property */
-	[103] = trampoline_nop, /* set_boolean_property */
-	[106] = trampoline_nop, /* remove_property */
-	[107] = trampoline_true, /* create_provider_service */
-	[108] = trampoline_true, /* create_product_service */
-	[109] = trampoline_true, /* create_pmu_service */
-	[110] = trampoline_true, /* create_iomfb_service */
-	[111] = trampoline_create_backlight_service,
-	[116] = dcpep_cb_boot_1,
-	[117] = trampoline_false, /* is_dark_boot */
-	[118] = trampoline_false, /* is_dark_boot / is_waking_from_hibernate*/
-	[120] = trampoline_read_edt_data,
-	[122] = trampoline_prop_start,
-	[123] = trampoline_prop_chunk,
-	[124] = trampoline_prop_end,
+	[103] = trampoline_nop, /* trigger_user_cal_loader */
+	[104] = trampoline_nop, /* set_boolean_property */
+	[107] = trampoline_nop, /* remove_property */
+	[108] = trampoline_true, /* create_provider_service */
+	[109] = trampoline_true, /* create_product_service */
+	[110] = trampoline_true, /* create_pmu_service */
+	[111] = trampoline_true, /* create_iomfb_service */
+	[112] = trampoline_create_backlight_service,
+	[113] = trampoline_true, /* create_nvram_service? */
+	//[114] = trampoline_get_tiling_state,
+	//[115] = trampoline_false, /* set_tiling_state */
+	[121] = dcpep_cb_boot_1, /* is_dark_boot */
+	[122] = trampoline_false, /* is_dark_boot / is_waking_from_hibernate*/
+	[123] = trampoline_false,
+	[125] = trampoline_read_edt_data,
+	[127] = trampoline_prop_start,
+	[128] = trampoline_prop_chunk,
+	[129] = trampoline_prop_end,
+	// [129] = trampoline_allocate_bandwidth,
 	[201] = trampoline_map_piodma,
 	[202] = trampoline_unmap_piodma,
 	[206] = iomfbep_cb_match_pmu_service_2,
 	[207] = iomfbep_cb_match_backlight_service,
-	[208] = trampoline_get_time,
-	[211] = trampoline_nop, /* update_backlight_factor_prop */
+	[208] = trampoline_nop, /* update_backlight_factor_prop */
+	[209] = trampoline_get_time,
 	[300] = trampoline_pr_publish,
 	[401] = trampoline_get_uint_prop,
 	[404] = trampoline_nop, /* sr_set_uint_prop */
@@ -75,7 +83,7 @@ static const iomfb_cb_handler cb_handlers[IOMFB_MAX_CB] = {
 	[415] = trampoline_true, /* sr_set_property_bool */
 	[451] = trampoline_allocate_buffer,
 	[452] = trampoline_map_physical,
-	[456] = trampoline_release_mem_desc,
+	[454] = trampoline_release_mem_desc,
 	[552] = trampoline_true, /* set_property_dict_0 */
 	[561] = trampoline_true, /* set_property_dict */
 	[563] = trampoline_true, /* set_property_int */
@@ -84,7 +92,8 @@ static const iomfb_cb_handler cb_handlers[IOMFB_MAX_CB] = {
 	[574] = trampoline_zero, /* power_up_dart */
 	[576] = trampoline_hotplug,
 	[577] = trampoline_nop, /* powerstate_notify */
-	[582] = trampoline_true, /* create_default_fb_surface */
+	//[582] = trampoline_create_dfb_surface, /* create_default_fb_surface */
+	[582] = trampoline_true,
 	[584] = trampoline_nop, /* IOMobileFramebufferAP::clear_default_surface */
 	[588] = trampoline_nop, /* resize_default_fb_surface_gated */
 	[589] = trampoline_swap_complete,
@@ -96,7 +105,6 @@ static const iomfb_cb_handler cb_handlers[IOMFB_MAX_CB] = {
 	[597] = trampoline_false, /* IOMobileFramebufferAP::preserveContents */
 	[598] = trampoline_nop, /* find_swap_function_gated */
 };
-
 void DCP_FW_NAME(iomfb_start)(struct apple_dcp *dcp)
 {
 	dcp->cb_handlers = cb_handlers;
diff --git a/drivers/gpu/drm/apple/iomfb_v12_3.h b/drivers/gpu/drm/apple/iomfb_v14_8_3.h
similarity index 51%
rename from drivers/gpu/drm/apple/iomfb_v12_3.h
rename to drivers/gpu/drm/apple/iomfb_v14_8_3.h
index 7359685d981fe5..9db803b9dc8090 100644
--- a/drivers/gpu/drm/apple/iomfb_v12_3.h
+++ b/drivers/gpu/drm/apple/iomfb_v14_8_3.h
@@ -1,17 +1,17 @@
 // SPDX-License-Identifier: GPL-2.0-only OR MIT
 /* Copyright The Asahi Linux Contributors */
 
-#ifndef __APPLE_IOMFB_V12_3_H__
-#define __APPLE_IOMFB_V12_3_H__
+#ifndef __APPLE_IOMFB_V14_8_3_H__
+#define __APPLE_IOMFB_V14_8_3_H__
 
 #include "version_utils.h"
 
-#define DCP_FW v12_3
-#define DCP_FW_VER DCP_FW_VERSION(12, 3, 0)
+#define DCP_FW v14_7_0
+#define DCP_FW_VER DCP_FW_VERSION(14, 7, 0)
 
 #include "iomfb_template.h"
 
 #undef DCP_FW_VER
 #undef DCP_FW
 
-#endif /* __APPLE_IOMFB_V12_3_H__ */
+#endif /* __APPLE_IOMFB_V14_8_3_H__ */
diff --git a/drivers/gpu/drm/apple/plane.c b/drivers/gpu/drm/apple/plane.c
index 2f0b76ad84ad65..643af649086c1b 100644
--- a/drivers/gpu/drm/apple/plane.c
+++ b/drivers/gpu/drm/apple/plane.c
@@ -249,7 +249,7 @@ static void apple_plane_atomic_update(struct drm_plane *plane,
 		.width = fb->width,
 		.height = fb->height,
 		.buf_size = fb->height * fb->pitches[0],
-		// .surface_id = req->swap.surf_ids[l],
+		.surface_id = plane->base.id,
 
 		/* Only used for compressed or multiplanar surfaces */
 		.pix_size = 1,
@@ -430,11 +430,7 @@ u64 apple_format_modifiers[] = {
 	DRM_FORMAT_MOD_INVALID
 };
 
-struct apple_plane {
-	struct drm_plane base;
-};
-
-struct drm_plane *apple_plane_init(struct drm_device *dev,
+struct apple_plane *apple_plane_init(struct drm_device *dev,
 				   unsigned long possible_crtcs,
 				   bool supports_l10r,
 				   enum drm_plane_type type)
@@ -487,5 +483,5 @@ struct drm_plane *apple_plane_init(struct drm_device *dev,
 	else
 		drm_plane_helper_add(&plane->base, &apple_plane_helper_funcs);
 
-	return &plane->base;
+	return plane;
 }
diff --git a/drivers/gpu/drm/apple/plane.h b/drivers/gpu/drm/apple/plane.h
index 67d15938cf0dcb..c0c28627a61042 100644
--- a/drivers/gpu/drm/apple/plane.h
+++ b/drivers/gpu/drm/apple/plane.h
@@ -12,6 +12,13 @@
 
 #include "iomfb_plane.h"
 
+struct apple_plane {
+	struct drm_plane base;
+	u8 iomfb_surf;
+};
+
+#define to_apple_plane(x) container_of(x, struct apple_plane, base)
+
 struct apple_plane_state {
 	struct drm_plane_state base;
 	struct dcp_surface surf;
@@ -22,7 +29,7 @@ struct apple_plane_state {
 
 #define to_apple_plane_state(x) container_of(x, struct apple_plane_state, base)
 
-struct drm_plane *apple_plane_init(struct drm_device *dev,
+struct apple_plane *apple_plane_init(struct drm_device *dev,
 				   unsigned long possible_crtcs,
 				   bool supports_l10r,
 				   enum drm_plane_type type);
diff --git a/drivers/gpu/drm/apple/version_utils.h b/drivers/gpu/drm/apple/version_utils.h
index 5a33ce1db61c47..542a5e9570866b 100644
--- a/drivers/gpu/drm/apple/version_utils.h
+++ b/drivers/gpu/drm/apple/version_utils.h
@@ -12,4 +12,10 @@
 #define DCP_FW_NAME(name) CONCATENATE(name, DCP_FW_SUFFIX)
 #define DCP_FW_VERSION(x, y, z) ( ((x) << 16) | ((y) << 8) | (z) )
 
+enum dcp_firmware_version {
+	DCP_FIRMWARE_UNKNOWN,
+	DCP_FIRMWARE_V_13_5,
+	DCP_FIRMWARE_V_14_7,
+};
+
 #endif /*__APPLE_VERSION_UTILS_H__*/