drm: apple: iomfb: Do not match/create PMU service for dcpext

Signed-off-by: Janne Grunau <j@jannau.net>

Author: jannau

drivers/gpu/drm/apple/dcp-internal.h

@@ -183,6 +183,9 @@ struct apple_dcp {
 	/* clear all surfaces on init */
 	bool surfaces_cleared;
 
+	/* is dcpext / requires dptx */
+	bool is_dptx;
+
 	/* Modes valid for the connected display */
 	struct dcp_display_mode *modes;
 	unsigned int nr_modes;

drivers/gpu/drm/apple/dcp.c

@@ -701,6 +701,8 @@ static int dcp_comp_bind(struct device *dev, struct device *main, void *data)
 	if (IS_ERR(dcp->coproc_reg))
 		return PTR_ERR(dcp->coproc_reg);
 
+	dcp->is_dptx = dcp->phy != NULL;
+
 	of_property_read_u32(dev->of_node, "apple,dcp-index",
 					   &dcp->index);
 	of_property_read_u32(dev->of_node, "apple,dptx-phy",

drivers/gpu/drm/apple/iomfb_template.c

@@ -135,6 +135,10 @@ static void complete_vi_set_temperature_hint(struct apple_dcp *dcp, void *out, v
 static bool iomfbep_cb_match_pmu_service(struct apple_dcp *dcp, int tag, void *out, void *in)
 {
 	trace_iomfb_callback(dcp, tag, __func__);
+
+	if (dcp->is_dptx)
+		return true;
+
 	iomfb_a358_vi_set_temperature_hint(dcp, false,
 					   complete_vi_set_temperature_hint,
 					   NULL);
@@ -158,6 +162,12 @@ static bool iomfbep_cb_match_pmu_service_2(struct apple_dcp *dcp, int tag, void
 {
 	trace_iomfb_callback(dcp, tag, __func__);
 
+	if (dcp->is_dptx) {
+		u8 *ret = out;
+		ret[0] = 1;
+		return true;
+	}
+
 	iomfb_a131_pmu_service_matched(dcp, false, complete_pmu_service_matched,
 				       out);
 
@@ -1044,6 +1054,11 @@ dcpep_cb_get_tiling_state(struct apple_dcp *dcp,
 	};
 }
 
+static u8 dcpep_cb_create_pmu_service(struct apple_dcp *dcp)
+{
+	return !dcp->is_dptx;
+}
+
 static u8 dcpep_cb_create_backlight_service(struct apple_dcp *dcp)
 {
 	return dcp_has_panel(dcp);
@@ -1101,6 +1116,7 @@ TRAMPOLINE_IN(trampoline_pr_publish, iomfb_cb_pr_publish,
 	      struct iomfb_property);
 TRAMPOLINE_INOUT(trampoline_get_tiling_state, dcpep_cb_get_tiling_state,
 		 struct dcpep_get_tiling_state_req, struct dcpep_get_tiling_state_resp);
+TRAMPOLINE_OUT(trampoline_create_pmu_service, dcpep_cb_create_pmu_service, u8);
 TRAMPOLINE_OUT(trampoline_create_backlight_service, dcpep_cb_create_backlight_service, u8);
 
 /*

drivers/gpu/drm/apple/iomfb_v12_3.c

@@ -48,7 +48,7 @@ static const iomfb_cb_handler cb_handlers[IOMFB_MAX_CB] = {
 	[106] = trampoline_nop, /* remove_property */
 	[107] = trampoline_true, /* create_provider_service */
 	[108] = trampoline_true, /* create_product_service */
-	[109] = trampoline_true, /* create_pmu_service */
+	[109] = trampoline_create_pmu_service,
 	[110] = trampoline_true, /* create_iomfb_service */
 	[111] = trampoline_create_backlight_service,
 	[116] = dcpep_cb_boot_1,

drivers/gpu/drm/apple/iomfb_v13_3.c

@@ -50,7 +50,7 @@ static const iomfb_cb_handler cb_handlers[IOMFB_MAX_CB] = {
 	[107] = trampoline_nop, /* remove_property */
 	[108] = trampoline_true, /* create_provider_service */
 	[109] = trampoline_true, /* create_product_service */
-	[110] = trampoline_true, /* create_pmu_service */
+	[110] = trampoline_create_pmu_service,
 	[111] = trampoline_true, /* create_iomfb_service */
 	[112] = trampoline_create_backlight_service,
 	[113] = trampoline_true, /* create_nvram_servce? */