Skip to content

Commit 5245fc6

Browse files
jannaumarcan
authored andcommitted
dcp: Pass the die number for dptx' connectTo method
Apperently just informative as display init on M2 Ultra in m1n1 worked as expected despite passing '0' as die number. Signed-off-by: Janne Grunau <[email protected]>
1 parent ba69847 commit 5245fc6

4 files changed

Lines changed: 7 additions & 4 deletions

File tree

src/dcp.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,8 @@ static int dcp_hdmi_dptx_init(dcp_dev_t *dcp, const display_config_t *cfg)
5555
}
5656
}
5757

58+
dcp->die = cfg->die;
59+
5860
dcp->phy = dptx_phy_init(cfg->dptx_phy, cfg->dcp_index);
5961
if (!dcp->phy) {
6062
printf("dcp: failed to init (lp)dptx-phy '%s'\n", cfg->dptx_phy);
@@ -93,7 +95,7 @@ static int dcp_hdmi_dptx_init(dcp_dev_t *dcp, const display_config_t *cfg)
9395
int dcp_connect_dptx(dcp_dev_t *dcp)
9496
{
9597
if (dcp->dptx_ep && dcp->phy) {
96-
return dcp_dptx_connect(dcp->dptx_ep, dcp->phy, 0);
98+
return dcp_dptx_connect(dcp->dptx_ep, dcp->phy, dcp->die, 0);
9799
}
98100

99101
return 0;

src/dcp.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ typedef struct dcp_dev {
3535
dcp_dpav_if_t *dpav_ep;
3636
dcp_dptx_if_t *dptx_ep;
3737
dptx_phy_t *phy;
38+
u32 die;
3839
u32 dp2hdmi_pwr_gpio;
3940
u32 hdmi_pwr_gpio;
4041
} dcp_dev_t;

src/dcp/dptx_port_ep.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -510,7 +510,7 @@ static const afk_epic_service_ops_t dcp_dptx_ops[] = {
510510
{},
511511
};
512512

513-
int dcp_dptx_connect(dcp_dptx_if_t *dptx, dptx_phy_t *phy, u32 port)
513+
int dcp_dptx_connect(dcp_dptx_if_t *dptx, dptx_phy_t *phy, u32 die, u32 port)
514514
{
515515
if (port > 1)
516516
return -1;
@@ -521,7 +521,7 @@ int dcp_dptx_connect(dcp_dptx_if_t *dptx, dptx_phy_t *phy, u32 port)
521521

522522
dptx->port[port].phy = dptx->phy = phy;
523523

524-
dptxport_connect(dptx->port[port].service, 0, dptx_phy_dcp_output(phy), 0);
524+
dptxport_connect(dptx->port[port].service, 0, dptx_phy_dcp_output(phy), die);
525525
dptxport_request_display(dptx->port[port].service);
526526

527527
return 0;

src/dcp/dptx_port_ep.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ enum dptx_link_rate {
5555
dcp_dptx_if_t *dcp_dptx_init(dcp_dev_t *dcp, u32 num_dptxports);
5656
int dcp_dptx_shutdown(dcp_dptx_if_t *dptx);
5757

58-
int dcp_dptx_connect(dcp_dptx_if_t *dptx, dptx_phy_t *phy, u32 port);
58+
int dcp_dptx_connect(dcp_dptx_if_t *dptx, dptx_phy_t *phy, u32 die, u32 port);
5959
int dcp_dptx_hpd(dcp_dptx_if_t *dptx, u32 port, bool hpd);
6060
int dcp_dptx_disconnect(dcp_dptx_if_t *dptx, u32 port);
6161
int dcp_dptx_hpd(dcp_dptx_if_t *dptx, u32 port, bool hpd);

0 commit comments

Comments
 (0)