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>

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 dff82dd11721ecd4d34904c38158790b5f43e054..8049320e8b035011beb4ceedf922f1d664a32895 100644 (file)
--- 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 8b72aa588b86871b67a64b3652b8b789d316fac0..48e59963dad4d1e7e8255d85416acacc0aec2861 100644 (file)
--- 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 10b70ca29ba3a48c85970dedf16939410765c858..c73d6054cdda19af63915d96574a496fbc0d4f2d 100644 (file)
--- 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;