Skip to content

Commit

Permalink
drm/amd/display: Update dcn10_init_hw for FPGA
Browse files Browse the repository at this point in the history
Update dcn10_init_hw such that initialization of relevant
HW blocks for Maximus FPGA are also initialized (and not skipped).

Signed-off-by: Eric Bernstein <eric.bernstein@amd.com>
Reviewed-by: Tony Cheng <Tony.Cheng@amd.com>
Acked-by: Harry Wentland <harry.wentland@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
  • Loading branch information
Eric Bernstein authored and Alex Deucher committed Feb 19, 2018
1 parent 28dc87e commit 529c690
Showing 1 changed file with 19 additions and 16 deletions.
35 changes: 19 additions & 16 deletions drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c
Original file line number Diff line number Diff line change
Expand Up @@ -692,26 +692,25 @@ static void dcn10_init_hw(struct dc *dc)
}

enable_power_gating_plane(dc->hwseq, true);
return;
}
/* end of FPGA. Below if real ASIC */
} else {

if (!dcb->funcs->is_accelerated_mode(dcb)) {
bios_golden_init(dc);
disable_vga(dc->hwseq);
}
if (!dcb->funcs->is_accelerated_mode(dcb)) {
bios_golden_init(dc);
disable_vga(dc->hwseq);
}

for (i = 0; i < dc->link_count; i++) {
/* Power up AND update implementation according to the
* required signal (which may be different from the
* default signal on connector).
*/
struct dc_link *link = dc->links[i];
for (i = 0; i < dc->link_count; i++) {
/* Power up AND update implementation according to the
* required signal (which may be different from the
* default signal on connector).
*/
struct dc_link *link = dc->links[i];

if (link->link_enc->connector.id == CONNECTOR_ID_EDP)
dc->hwss.edp_power_control(link, true);
if (link->link_enc->connector.id == CONNECTOR_ID_EDP)
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++) {
Expand Down Expand Up @@ -779,6 +778,10 @@ static void dcn10_init_hw(struct dc *dc)
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++) {
struct audio *audio = dc->res_pool->audios[i];

Expand Down

0 comments on commit 529c690

Please sign in to comment.