[PATCH 03/12] drm/amd/display: Fix bugs causing Hawaii and Bonaire not light up.

[Harry Wentland]

From: Zeyu Fan <Zeyu.Fan at amd.com>

Change-Id: If4055105c7007399d29389343e304dd4fff3aa2f
Signed-off-by: Zeyu Fan <Zeyu.Fan at amd.com>
Reviewed-by: Tony Cheng <Tony.Cheng at amd.com>
Acked-by: Harry Wentland <Harry.Wentland at amd.com>
---
 .../gpu/drm/amd/display/dc/bios/dce110/command_table_helper_dce110.c    | 2 +-
 .../gpu/drm/amd/display/dc/bios/dce112/command_table_helper_dce112.c    | 2 +-
 drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.c                   | 2 +-
 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 86e55d028cbf..cfdb6a7d042b 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;
-- 
2.9.3