drm/apple: Unify driver into a single module

jannau · jannau · commit 1a697da422ba · 2025-12-22T23:18:06.000+01:00
Signed-off-by: Janne Grunau &lt;j@jannau.net&gt;
diff --git a/drivers/gpu/drm/apple/Makefile b/drivers/gpu/drm/apple/Makefile
@@ -3,20 +3,19 @@
 CFLAGS_trace.o = -I$(src)
 
 appledrm-y := apple_drv.o
+appledrm-y += afk.o dcp.o dcp_backlight.o dptxep.o iomfb.o parser.o systemep.o
+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 += epic/dpavservep.o
 
-apple_dcp-y := afk.o dcp.o dcp_backlight.o dptxep.o iomfb.o parser.o systemep.o
-apple_dcp-$(CONFIG_DRM_APPLE_AUDIO) += audio.o
-apple_dcp-$(CONFIG_DRM_APPLE_AUDIO) += av.o
-apple_dcp-y += connector.o
-apple_dcp-y += ibootep.o
-apple_dcp-y += iomfb_v12_3.o
-apple_dcp-y += iomfb_v13_3.o
-apple_dcp-y += epic/dpavservep.o
 
-apple_dcp-$(CONFIG_TRACING) += trace.o
+appledrm-$(CONFIG_TRACING) += trace.o
 
 obj-$(CONFIG_DRM_APPLE) += appledrm.o
-obj-$(CONFIG_DRM_APPLE) += apple_dcp.o
 
 # header test
 
diff --git a/drivers/gpu/drm/apple/apple_drv.c b/drivers/gpu/drm/apple/apple_drv.c
@@ -812,7 +812,33 @@ static struct platform_driver apple_platform_driver = {
 	.remove		= apple_platform_remove,
 };
 
-drm_module_platform_driver(apple_platform_driver);
+
+
+static int __init appledrm_register(void)
+{
+	if (drm_firmware_drivers_only())
+		return -ENODEV;
+
+#if IS_ENABLED(CONFIG_DRM_APPLE_AUDIO)
+	dcp_audio_register();
+#endif
+	dcp_register();
+	platform_driver_register(&apple_platform_driver);
+
+	return 0;
+}
+
+static void __exit appledrm_unregister(void)
+{
+#if IS_ENABLED(CONFIG_DRM_APPLE_AUDIO)
+	dcp_audio_unregister();
+#endif
+	dcp_unregister();
+	platform_driver_unregister(&apple_platform_driver);
+}
+
+module_init(appledrm_register);
+module_exit(appledrm_unregister);
 
 MODULE_AUTHOR("Alyssa Rosenzweig <alyssa@rosenzweig.io>");
 MODULE_DESCRIPTION(DRIVER_DESC);
diff --git a/drivers/gpu/drm/apple/connector.c b/drivers/gpu/drm/apple/connector.c
@@ -120,7 +120,6 @@ void apple_connector_debugfs_init(struct drm_connector *connector, struct dentry
 		break;
 	}
 }
-EXPORT_SYMBOL(apple_connector_debugfs_init);
 
 static void dcp_connector_set_dict(struct apple_connector *connector,
 				   struct dcp_chunks *dict,
diff --git a/drivers/gpu/drm/apple/dcp.c b/drivers/gpu/drm/apple/dcp.c
@@ -201,7 +201,6 @@ int dcp_set_crc(struct drm_crtc *crtc, bool enabled)
 
 	return 0;
 }
-EXPORT_SYMBOL_GPL(dcp_set_crc);
 
 /*
  * Helper to send a DRM vblank event. We do not know how call swap_submit_dcp
@@ -361,15 +360,13 @@ int dcp_crtc_atomic_check(struct drm_crtc *crtc, struct drm_atomic_state *state)
 
 	return 0;
 }
-EXPORT_SYMBOL_GPL(dcp_crtc_atomic_check);
 
 int dcp_get_connector_type(struct platform_device *pdev)
 {
 	struct apple_dcp *dcp = platform_get_drvdata(pdev);
 
 	return (dcp->connector_type);
 }
-EXPORT_SYMBOL_GPL(dcp_get_connector_type);
 
 #define DPTX_CONNECT_TIMEOUT msecs_to_jiffies(2000)
 
@@ -451,7 +448,6 @@ int dcp_dptx_connect_oob(struct platform_device *pdev, u32 port)
 	struct apple_dcp *dcp = platform_get_drvdata(pdev);
 	return dcp_dptx_connect(dcp, port);
 }
-EXPORT_SYMBOL_GPL(dcp_dptx_connect_oob);
 
 int dcp_dptx_disconnect_oob(struct platform_device *pdev, u32 port)
 {
@@ -467,7 +463,6 @@ int dcp_dptx_disconnect_oob(struct platform_device *pdev, u32 port)
 
 	return dcp_dptx_disconnect(dcp, port);
 }
-EXPORT_SYMBOL_GPL(dcp_dptx_disconnect_oob);
 
 static irqreturn_t dcp_dp2hdmi_hpd(int irq, void *data)
 {
@@ -502,7 +497,6 @@ void dcp_link(struct platform_device *pdev, struct apple_crtc *crtc,
 	dcp->crtc = crtc;
 	dcp->connector = connector;
 }
-EXPORT_SYMBOL_GPL(dcp_link);
 
 int dcp_start(struct platform_device *pdev)
 {
@@ -575,7 +569,6 @@ int dcp_start(struct platform_device *pdev)
 
 	return ret;
 }
-EXPORT_SYMBOL(dcp_start);
 
 static int dcp_enable_dp2hdmi_hpd(struct apple_dcp *dcp)
 {
@@ -618,7 +611,6 @@ int dcp_wait_ready(struct platform_device *pdev, u64 timeout)
 
 	return dcp->active ? 0 : -ETIMEDOUT;
 }
-EXPORT_SYMBOL(dcp_wait_ready);
 
 static void __maybe_unused dcp_sleep(struct apple_dcp *dcp)
 {
@@ -662,7 +654,6 @@ void dcp_poweron(struct platform_device *pdev)
 	if (dcp->avep)
 		av_service_connect(dcp);
 }
-EXPORT_SYMBOL(dcp_poweron);
 
 void dcp_poweroff(struct platform_device *pdev)
 {
@@ -691,7 +682,6 @@ void dcp_poweroff(struct platform_device *pdev)
 		}
 	}
 }
-EXPORT_SYMBOL(dcp_poweroff);
 
 static void dcp_work_register_backlight(struct work_struct *work)
 {
@@ -1339,28 +1329,12 @@ static struct platform_driver apple_platform_driver = {
 	},
 };
 
-static int __init apple_dcp_register(void)
+void __init dcp_register(void)
 {
-	if (drm_firmware_drivers_only())
-		return -ENODEV;
-
-#if IS_ENABLED(CONFIG_DRM_APPLE_AUDIO)
-	dcp_audio_register();
-#endif
-	return platform_driver_register(&apple_platform_driver);
+	platform_driver_register(&apple_platform_driver);
 }
 
-static void __exit apple_dcp_unregister(void)
+void __exit dcp_unregister(void)
 {
 	platform_driver_unregister(&apple_platform_driver);
-#if IS_ENABLED(CONFIG_DRM_APPLE_AUDIO)
-	dcp_audio_unregister();
-#endif
 }
-
-module_init(apple_dcp_register);
-module_exit(apple_dcp_unregister);
-
-MODULE_AUTHOR("Alyssa Rosenzweig <alyssa@rosenzweig.io>");
-MODULE_DESCRIPTION("Apple Display Controller DRM driver");
-MODULE_LICENSE("Dual MIT/GPL");
diff --git a/drivers/gpu/drm/apple/dcp.h b/drivers/gpu/drm/apple/dcp.h
@@ -68,6 +68,9 @@ int dpavservep_init(struct apple_dcp *dcp);
 int avep_init(struct apple_dcp *dcp);
 
 
+void __init dcp_register(void);
+void __exit dcp_unregister(void);
+
 void __init dcp_audio_register(void);
 void __exit dcp_audio_unregister(void);
 
diff --git a/drivers/gpu/drm/apple/iomfb.c b/drivers/gpu/drm/apple/iomfb.c
@@ -258,7 +258,6 @@ void dcp_hotplug(struct work_struct *work)
 
 	drm_kms_helper_connector_hotplug_event(&connector->base);
 }
-EXPORT_SYMBOL_GPL(dcp_hotplug);
 
 static void dcpep_handle_cb(struct apple_dcp *dcp, enum dcp_context_id context,
 			    void *data, u32 length, u16 offset)
@@ -413,7 +412,6 @@ int dcp_get_modes(struct drm_connector *connector)
 
 	return dcp->nr_modes;
 }
-EXPORT_SYMBOL_GPL(dcp_get_modes);
 
 /* The user may own drm_display_mode, so we need to search for our copy */
 struct dcp_display_mode *lookup_mode(struct apple_dcp *dcp,
@@ -440,7 +438,6 @@ enum drm_mode_status dcp_mode_valid(struct drm_connector *connector,
 
 	return lookup_mode(dcp, mode) ? MODE_OK : MODE_BAD;
 }
-EXPORT_SYMBOL_GPL(dcp_mode_valid);
 
 int dcp_crtc_atomic_modeset(struct drm_crtc *crtc,
 			    struct drm_atomic_state *state)
@@ -479,7 +476,6 @@ int dcp_crtc_atomic_modeset(struct drm_crtc *crtc,
 
 	return ret;
 }
-EXPORT_SYMBOL_GPL(dcp_crtc_atomic_modeset);
 
 bool dcp_crtc_mode_fixup(struct drm_crtc *crtc,
 			 const struct drm_display_mode *mode,
@@ -492,7 +488,6 @@ bool dcp_crtc_mode_fixup(struct drm_crtc *crtc,
 	/* TODO: support synthesized modes through scaling */
 	return lookup_mode(dcp, mode) != NULL;
 }
-EXPORT_SYMBOL(dcp_crtc_mode_fixup);
 
 
 void dcp_flush(struct drm_crtc *crtc, struct drm_atomic_state *state)
@@ -527,7 +522,6 @@ void dcp_flush(struct drm_crtc *crtc, struct drm_atomic_state *state)
 		break;
 	}
 }
-EXPORT_SYMBOL_GPL(dcp_flush);
 
 static void iomfb_start(struct apple_dcp *dcp)
 {
@@ -550,7 +544,6 @@ bool dcp_is_initialized(struct platform_device *pdev)
 
 	return dcp->active;
 }
-EXPORT_SYMBOL_GPL(dcp_is_initialized);
 
 void iomfb_recv_msg(struct apple_dcp *dcp, u64 message)
 {
diff --git a/drivers/gpu/drm/apple/parser.c b/drivers/gpu/drm/apple/parser.c
@@ -959,7 +959,6 @@ int parse_sound_constraints(struct dcp_parse_ctx *handle,
 
 	return 0;
 }
-EXPORT_SYMBOL_GPL(parse_sound_constraints);
 
 int parse_sound_mode(struct dcp_parse_ctx *handle,
 		     struct dcp_sound_format_mask *sieve,
@@ -989,7 +988,6 @@ int parse_sound_mode(struct dcp_parse_ctx *handle,
 
 	return 0;
 }
-EXPORT_SYMBOL_GPL(parse_sound_mode);
 #endif
 
 int parse_system_log_mnits(struct dcp_parse_ctx *handle, struct dcp_system_ev_mnits *entry)

Original file line number	Diff line number	Diff line change
`@@ -120,7 +120,6 @@ void apple_connector_debugfs_init(struct drm_connector *connector, struct dentry`
`120`	`120`	`break;`
`121`	`121`	`}`
`122`	`122`	`}`
`123`		`-EXPORT_SYMBOL(apple_connector_debugfs_init);`
`124`	`123`
`125`	`124`	`static void dcp_connector_set_dict(struct apple_connector *connector,`
`126`	`125`	`struct dcp_chunks *dict,`
Original file line number	Diff line number	Diff line change
`@@ -201,7 +201,6 @@ int dcp_set_crc(struct drm_crtc *crtc, bool enabled)`
`201`	`201`
`202`	`202`	`return 0;`
`203`	`203`	`}`
`204`		`-EXPORT_SYMBOL_GPL(dcp_set_crc);`
`205`	`204`
`206`	`205`	`/*`
`207`	`206`	`* Helper to send a DRM vblank event. We do not know how call swap_submit_dcp`
`@@ -361,15 +360,13 @@ int dcp_crtc_atomic_check(struct drm_crtc crtc, struct drm_atomic_state state)`
`361`	`360`
`362`	`361`	`return 0;`
`363`	`362`	`}`
`364`		`-EXPORT_SYMBOL_GPL(dcp_crtc_atomic_check);`
`365`	`363`
`366`	`364`	`int dcp_get_connector_type(struct platform_device *pdev)`
`367`	`365`	`{`
`368`	`366`	`struct apple_dcp *dcp = platform_get_drvdata(pdev);`
`369`	`367`
`370`	`368`	`return (dcp->connector_type);`
`371`	`369`	`}`
`372`		`-EXPORT_SYMBOL_GPL(dcp_get_connector_type);`
`373`	`370`
`374`	`371`	`#define DPTX_CONNECT_TIMEOUT msecs_to_jiffies(2000)`
`375`	`372`
`@@ -451,7 +448,6 @@ int dcp_dptx_connect_oob(struct platform_device *pdev, u32 port)`
`451`	`448`	`struct apple_dcp *dcp = platform_get_drvdata(pdev);`
`452`	`449`	`return dcp_dptx_connect(dcp, port);`
`453`	`450`	`}`
`454`		`-EXPORT_SYMBOL_GPL(dcp_dptx_connect_oob);`
`455`	`451`
`456`	`452`	`int dcp_dptx_disconnect_oob(struct platform_device *pdev, u32 port)`
`457`	`453`	`{`
`@@ -467,7 +463,6 @@ int dcp_dptx_disconnect_oob(struct platform_device *pdev, u32 port)`
`467`	`463`
`468`	`464`	`return dcp_dptx_disconnect(dcp, port);`
`469`	`465`	`}`
`470`		`-EXPORT_SYMBOL_GPL(dcp_dptx_disconnect_oob);`
`471`	`466`
`472`	`467`	`static irqreturn_t dcp_dp2hdmi_hpd(int irq, void *data)`
`473`	`468`	`{`
`@@ -502,7 +497,6 @@ void dcp_link(struct platform_device pdev, struct apple_crtc crtc,`
`502`	`497`	`dcp->crtc = crtc;`
`503`	`498`	`dcp->connector = connector;`
`504`	`499`	`}`
`505`		`-EXPORT_SYMBOL_GPL(dcp_link);`
`506`	`500`
`507`	`501`	`int dcp_start(struct platform_device *pdev)`
`508`	`502`	`{`
`@@ -575,7 +569,6 @@ int dcp_start(struct platform_device *pdev)`
`575`	`569`
`576`	`570`	`return ret;`
`577`	`571`	`}`
`578`		`-EXPORT_SYMBOL(dcp_start);`
`579`	`572`
`580`	`573`	`static int dcp_enable_dp2hdmi_hpd(struct apple_dcp *dcp)`
`581`	`574`	`{`
`@@ -618,7 +611,6 @@ int dcp_wait_ready(struct platform_device *pdev, u64 timeout)`
`618`	`611`
`619`	`612`	`return dcp->active ? 0 : -ETIMEDOUT;`
`620`	`613`	`}`
`621`		`-EXPORT_SYMBOL(dcp_wait_ready);`
`622`	`614`
`623`	`615`	`static void __maybe_unused dcp_sleep(struct apple_dcp *dcp)`
`624`	`616`	`{`
`@@ -662,7 +654,6 @@ void dcp_poweron(struct platform_device *pdev)`
`662`	`654`	`if (dcp->avep)`
`663`	`655`	`av_service_connect(dcp);`
`664`	`656`	`}`
`665`		`-EXPORT_SYMBOL(dcp_poweron);`
`666`	`657`
`667`	`658`	`void dcp_poweroff(struct platform_device *pdev)`
`668`	`659`	`{`
`@@ -691,7 +682,6 @@ void dcp_poweroff(struct platform_device *pdev)`
`691`	`682`	`}`
`692`	`683`	`}`
`693`	`684`	`}`
`694`		`-EXPORT_SYMBOL(dcp_poweroff);`
`695`	`685`
`696`	`686`	`static void dcp_work_register_backlight(struct work_struct *work)`
`697`	`687`	`{`
`@@ -1339,28 +1329,12 @@ static struct platform_driver apple_platform_driver = {`
`1339`	`1329`	`},`
`1340`	`1330`	`};`
`1341`	`1331`
`1342`		`-static int __init apple_dcp_register(void)`
	`1332`	`+void __init dcp_register(void)`
`1343`	`1333`	`{`
`1344`		`- if (drm_firmware_drivers_only())`
`1345`		`- return -ENODEV;`
`1346`		`-`
`1347`		`-#if IS_ENABLED(CONFIG_DRM_APPLE_AUDIO)`
`1348`		`- dcp_audio_register();`
`1349`		`-#endif`
`1350`		`- return platform_driver_register(&apple_platform_driver);`
	`1334`	`+ platform_driver_register(&apple_platform_driver);`
`1351`	`1335`	`}`
`1352`	`1336`
`1353`		`-static void __exit apple_dcp_unregister(void)`
	`1337`	`+void __exit dcp_unregister(void)`
`1354`	`1338`	`{`
`1355`	`1339`	`platform_driver_unregister(&apple_platform_driver);`
`1356`		`-#if IS_ENABLED(CONFIG_DRM_APPLE_AUDIO)`
`1357`		`- dcp_audio_unregister();`
`1358`		`-#endif`
`1359`	`1340`	`}`
`1360`		`-`
`1361`		`-module_init(apple_dcp_register);`
`1362`		`-module_exit(apple_dcp_unregister);`
`1363`		`-`
`1364`		`-MODULE_AUTHOR("Alyssa Rosenzweig <[email protected]>");`
`1365`		`-MODULE_DESCRIPTION("Apple Display Controller DRM driver");`
`1366`		`-MODULE_LICENSE("Dual MIT/GPL");`
Original file line number	Diff line number	Diff line change
`@@ -258,7 +258,6 @@ void dcp_hotplug(struct work_struct *work)`
`258`	`258`
`259`	`259`	`drm_kms_helper_connector_hotplug_event(&connector->base);`
`260`	`260`	`}`
`261`		`-EXPORT_SYMBOL_GPL(dcp_hotplug);`
`262`	`261`
`263`	`262`	`static void dcpep_handle_cb(struct apple_dcp *dcp, enum dcp_context_id context,`
`264`	`263`	`void *data, u32 length, u16 offset)`
`@@ -413,7 +412,6 @@ int dcp_get_modes(struct drm_connector *connector)`
`413`	`412`
`414`	`413`	`return dcp->nr_modes;`
`415`	`414`	`}`
`416`		`-EXPORT_SYMBOL_GPL(dcp_get_modes);`
`417`	`415`
`418`	`416`	`/* The user may own drm_display_mode, so we need to search for our copy */`
`419`	`417`	`struct dcp_display_mode lookup_mode(struct apple_dcp dcp,`
`@@ -440,7 +438,6 @@ enum drm_mode_status dcp_mode_valid(struct drm_connector *connector,`
`440`	`438`
`441`	`439`	`return lookup_mode(dcp, mode) ? MODE_OK : MODE_BAD;`
`442`	`440`	`}`
`443`		`-EXPORT_SYMBOL_GPL(dcp_mode_valid);`
`444`	`441`
`445`	`442`	`int dcp_crtc_atomic_modeset(struct drm_crtc *crtc,`
`446`	`443`	`struct drm_atomic_state *state)`
`@@ -479,7 +476,6 @@ int dcp_crtc_atomic_modeset(struct drm_crtc *crtc,`
`479`	`476`
`480`	`477`	`return ret;`
`481`	`478`	`}`
`482`		`-EXPORT_SYMBOL_GPL(dcp_crtc_atomic_modeset);`
`483`	`479`
`484`	`480`	`bool dcp_crtc_mode_fixup(struct drm_crtc *crtc,`
`485`	`481`	`const struct drm_display_mode *mode,`
`@@ -492,7 +488,6 @@ bool dcp_crtc_mode_fixup(struct drm_crtc *crtc,`
`492`	`488`	`/* TODO: support synthesized modes through scaling */`
`493`	`489`	`return lookup_mode(dcp, mode) != NULL;`
`494`	`490`	`}`
`495`		`-EXPORT_SYMBOL(dcp_crtc_mode_fixup);`
`496`	`491`
`497`	`492`
`498`	`493`	`void dcp_flush(struct drm_crtc crtc, struct drm_atomic_state state)`
`@@ -527,7 +522,6 @@ void dcp_flush(struct drm_crtc crtc, struct drm_atomic_state state)`
`527`	`522`	`break;`
`528`	`523`	`}`
`529`	`524`	`}`
`530`		`-EXPORT_SYMBOL_GPL(dcp_flush);`
`531`	`525`
`532`	`526`	`static void iomfb_start(struct apple_dcp *dcp)`
`533`	`527`	`{`
`@@ -550,7 +544,6 @@ bool dcp_is_initialized(struct platform_device *pdev)`
`550`	`544`
`551`	`545`	`return dcp->active;`
`552`	`546`	`}`
`553`		`-EXPORT_SYMBOL_GPL(dcp_is_initialized);`
`554`	`547`
`555`	`548`	`void iomfb_recv_msg(struct apple_dcp *dcp, u64 message)`
`556`	`549`	`{`
Original file line number	Diff line number	Diff line change
`@@ -959,7 +959,6 @@ int parse_sound_constraints(struct dcp_parse_ctx *handle,`
`959`	`959`
`960`	`960`	`return 0;`
`961`	`961`	`}`
`962`		`-EXPORT_SYMBOL_GPL(parse_sound_constraints);`
`963`	`962`
`964`	`963`	`int parse_sound_mode(struct dcp_parse_ctx *handle,`
`965`	`964`	`struct dcp_sound_format_mask *sieve,`
`@@ -989,7 +988,6 @@ int parse_sound_mode(struct dcp_parse_ctx *handle,`
`989`	`988`
`990`	`989`	`return 0;`
`991`	`990`	`}`
`992`		`-EXPORT_SYMBOL_GPL(parse_sound_mode);`
`993`	`991`	`#endif`
`994`	`992`
`995`	`993`	`int parse_system_log_mnits(struct dcp_parse_ctx handle, struct dcp_system_ev_mnits entry)`