Skip to content

Commit 846aca8

Browse files
committed
drm: apple: audio: init AV endpoint later
This seems to get rid of initialization timeouts / failures. Signed-off-by: Janne Grunau <j@jannau.net>
1 parent 160d97b commit 846aca8

1 file changed

Lines changed: 9 additions & 8 deletions

File tree

  • drivers/gpu/drm/apple

drivers/gpu/drm/apple/dcp.c

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -371,14 +371,6 @@ int dcp_start(struct platform_device *pdev)
371371
if (ret)
372372
dev_warn(dcp->dev, "Failed to start system endpoint: %d\n", ret);
373373

374-
#if IS_ENABLED(CONFIG_DRM_APPLE_AUDIO)
375-
if (!noaudio) {
376-
ret = avep_init(dcp);
377-
if (ret)
378-
dev_warn(dcp->dev, "Failed to start AV endpoint: %d", ret);
379-
}
380-
#endif
381-
382374
if (dcp->phy && dcp->fw_compat >= DCP_FIRMWARE_V_13_5) {
383375
ret = ibootep_init(dcp);
384376
if (ret)
@@ -420,6 +412,15 @@ int dcp_start(struct platform_device *pdev)
420412
if (ret)
421413
dev_err(dcp->dev, "Failed to start IOMFB endpoint: %d\n", ret);
422414

415+
#if IS_ENABLED(CONFIG_DRM_APPLE_AUDIO)
416+
if (!noaudio) {
417+
ret = avep_init(dcp);
418+
if (ret)
419+
dev_warn(dcp->dev, "Failed to start AV endpoint: %d", ret);
420+
ret = 0;
421+
}
422+
#endif
423+
423424
return ret;
424425
}
425426
EXPORT_SYMBOL(dcp_start);

0 commit comments

Comments
 (0)