blob: 1f296a5aa6f547fabcbec5bef5702c5b8deba720 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
|
From a6d115a76a98f78fd2c0c2f70208d86b2aed3dcd Mon Sep 17 00:00:00 2001
From: Zeyu Fan <Zeyu.Fan@amd.com>
Date: Tue, 6 Dec 2016 12:59:52 -0500
Subject: [PATCH 0025/4131] 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>
---
.../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 dff82dd..8049320 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 8b72aa5..48e5996 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 10b70ca..c73d605 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.7.4
|
