diff options
| author | Zeyu Fan <Zeyu.Fan@amd.com> | 2016-12-06 12:59:52 -0500 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2017-09-26 17:01:59 -0400 |
| commit | 8e545104aa05b5e0720fd2042e2f9729f9c13744 (patch) | |
| tree | db657980812e79c56eec0f3c693e56971576169f /drivers/gpu/drm | |
| parent | 56bc1c42610aa6328e6c4b222dc076acffb40243 (diff) | |
| download | linux-8e545104aa05b5e0720fd2042e2f9729f9c13744.tar.bz2 | |
drm/amd/display: Fix bugs causing Hawaii and Bonaire not light up.
Signed-off-by: Zeyu Fan <Zeyu.Fan@amd.com>
Acked-by: Jordan Lazare <Jordan.Lazare@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm')
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/amd/display/dc/bios/dce110/command_table_helper_dce110.c b/drivers/gpu/drm/amd/display/dc/bios/dce110/command_table_helper_dce110.c index dff82dd11721..8049320e8b03 100644 --- a/drivers/gpu/drm/amd/display/dc/bios/dce110/command_table_helper_dce110.c +++ b/drivers/gpu/drm/amd/display/dc/bios/dce110/command_table_helper_dce110.c @@ -186,7 +186,7 @@ static uint8_t dig_encoder_sel_to_atom(enum engine_id id) break; } - return atom_dig_encoder_sel; + return 0; } static bool clock_source_id_to_atom( diff --git a/drivers/gpu/drm/amd/display/dc/bios/dce112/command_table_helper_dce112.c b/drivers/gpu/drm/amd/display/dc/bios/dce112/command_table_helper_dce112.c index 8b72aa588b86..48e59963dad4 100644 --- a/drivers/gpu/drm/amd/display/dc/bios/dce112/command_table_helper_dce112.c +++ b/drivers/gpu/drm/amd/display/dc/bios/dce112/command_table_helper_dce112.c @@ -183,7 +183,7 @@ static uint8_t dig_encoder_sel_to_atom(enum engine_id id) break; } - return atom_dig_encoder_sel; + return 0; } static bool clock_source_id_to_atom( diff --git a/drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.c b/drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.c index 10b70ca29ba3..c73d6054cdda 100644 --- a/drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.c +++ b/drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.c @@ -1281,7 +1281,7 @@ void dce110_link_encoder_enable_dp_output( configure_encoder(enc110, link_settings); cntl.action = TRANSMITTER_CONTROL_ENABLE; - cntl.engine_id = ENGINE_ID_UNKNOWN; + cntl.engine_id = enc->preferred_engine; cntl.transmitter = enc110->base.transmitter; cntl.pll_id = clock_source; cntl.signal = SIGNAL_TYPE_DISPLAY_PORT; |