Commit 529c690b authored by Eric Bernstein's avatar Eric Bernstein Committed by Alex Deucher

drm/amd/display: Update dcn10_init_hw for FPGA

Update dcn10_init_hw such that initialization of relevant
HW blocks for Maximus FPGA are also initialized (and not skipped).
Signed-off-by: default avatarEric Bernstein <eric.bernstein@amd.com>
Reviewed-by: default avatarTony Cheng <Tony.Cheng@amd.com>
Acked-by: default avatarHarry Wentland <harry.wentland@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 28dc87e4
...@@ -692,26 +692,25 @@ static void dcn10_init_hw(struct dc *dc) ...@@ -692,26 +692,25 @@ static void dcn10_init_hw(struct dc *dc)
} }
enable_power_gating_plane(dc->hwseq, true); enable_power_gating_plane(dc->hwseq, true);
return; } else {
}
/* end of FPGA. Below if real ASIC */
if (!dcb->funcs->is_accelerated_mode(dcb)) { if (!dcb->funcs->is_accelerated_mode(dcb)) {
bios_golden_init(dc); bios_golden_init(dc);
disable_vga(dc->hwseq); disable_vga(dc->hwseq);
} }
for (i = 0; i < dc->link_count; i++) { for (i = 0; i < dc->link_count; i++) {
/* Power up AND update implementation according to the /* Power up AND update implementation according to the
* required signal (which may be different from the * required signal (which may be different from the
* default signal on connector). * default signal on connector).
*/ */
struct dc_link *link = dc->links[i]; struct dc_link *link = dc->links[i];
if (link->link_enc->connector.id == CONNECTOR_ID_EDP) if (link->link_enc->connector.id == CONNECTOR_ID_EDP)
dc->hwss.edp_power_control(link, true); dc->hwss.edp_power_control(link, true);
link->link_enc->funcs->hw_init(link->link_enc); link->link_enc->funcs->hw_init(link->link_enc);
}
} }
for (i = 0; i < dc->res_pool->pipe_count; i++) { for (i = 0; i < dc->res_pool->pipe_count; i++) {
...@@ -779,6 +778,10 @@ static void dcn10_init_hw(struct dc *dc) ...@@ -779,6 +778,10 @@ static void dcn10_init_hw(struct dc *dc)
tg->funcs->tg_init(tg); tg->funcs->tg_init(tg);
} }
/* end of FPGA. Below if real ASIC */
if (IS_FPGA_MAXIMUS_DC(dc->ctx->dce_environment))
return;
for (i = 0; i < dc->res_pool->audio_count; i++) { for (i = 0; i < dc->res_pool->audio_count; i++) {
struct audio *audio = dc->res_pool->audios[i]; struct audio *audio = dc->res_pool->audios[i];
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment