Skip to content

Commit 160d97b

Browse files
committed
drm: apple: dptx: Remove DPTX disconnect/connect on init
This was only necessary for dcp0 on M2* devices presumably because the reset in m1n1 doesn't work as intended. Signed-off-by: Janne Grunau <j@jannau.net>
1 parent be8ab0c commit 160d97b

1 file changed

Lines changed: 12 additions & 4 deletions

File tree

  • drivers/gpu/drm/apple

drivers/gpu/drm/apple/dcp.c

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -386,10 +386,17 @@ int dcp_start(struct platform_device *pdev)
386386
ret);
387387

388388
ret = dptxep_init(dcp);
389-
if (ret)
389+
if (ret) {
390390
dev_warn(dcp->dev, "Failed to start DPTX endpoint: %d\n",
391391
ret);
392-
else if (dcp->dptxport[0].enabled) {
392+
#ifdef DCP_DPTX_DISCONNECT_ON_INIT
393+
/*
394+
* This disconnect / connect cycle on init is only necessary
395+
* when using dcp0 on j473, j474s and presumedly j475c.
396+
* Since dcp0 is not used at the moment let's avoid this
397+
* since it is possibly the cause for startup issues.
398+
*/
399+
} else if (dcp->dptxport[0].enabled) {
393400
bool connected;
394401
/* force disconnect on start - necessary if the display
395402
* is already up from m1n1
@@ -404,10 +411,11 @@ int dcp_start(struct platform_device *pdev)
404411
// necessary on j473/j474 but not on j314c
405412
if (connected)
406413
dcp_dptx_connect(dcp, 0);
414+
#endif
407415
}
408-
} else if (dcp->phy)
416+
} else if (dcp->phy) {
409417
dev_warn(dcp->dev, "OS firmware incompatible with dptxport EP\n");
410-
418+
}
411419
ret = iomfb_start_rtkit(dcp);
412420
if (ret)
413421
dev_err(dcp->dev, "Failed to start IOMFB endpoint: %d\n", ret);

0 commit comments

Comments
 (0)