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
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
|
From 19aadd4ee1f46aaaa8e9697aa860d18e548448d3 Mon Sep 17 00:00:00 2001
From: Harry Wentland <harry.wentland@amd.com>
Date: Thu, 1 Dec 2016 10:00:09 -0500
Subject: [PATCH 0030/4131] drm/amd/display: Remove obsolete
LATEST_ATOM_BIOS_SUPPORT
Signed-off-by: Harry Wentland <harry.wentland@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>
---
drivers/gpu/drm/amd/display/dc/bios/Makefile | 1 -
drivers/gpu/drm/amd/display/dc/bios/command_table.c | 16 ----------------
2 files changed, 17 deletions(-)
diff --git a/drivers/gpu/drm/amd/display/dc/bios/Makefile b/drivers/gpu/drm/amd/display/dc/bios/Makefile
index 9ba677f..876614d 100644
--- a/drivers/gpu/drm/amd/display/dc/bios/Makefile
+++ b/drivers/gpu/drm/amd/display/dc/bios/Makefile
@@ -20,5 +20,4 @@ AMD_DISPLAY_FILES += $(AMDDALPATH)/dc/bios/dce80/command_table_helper_dce80.o
###############################################################################
AMD_DISPLAY_FILES += $(AMDDALPATH)/dc/bios/dce110/command_table_helper_dce110.o
-ccflags-y += -DLATEST_ATOM_BIOS_SUPPORT
AMD_DISPLAY_FILES += $(AMDDALPATH)/dc/bios/dce112/command_table_helper_dce112.o
diff --git a/drivers/gpu/drm/amd/display/dc/bios/command_table.c b/drivers/gpu/drm/amd/display/dc/bios/command_table.c
index 51f6052..d0eedb62 100644
--- a/drivers/gpu/drm/amd/display/dc/bios/command_table.c
+++ b/drivers/gpu/drm/amd/display/dc/bios/command_table.c
@@ -115,11 +115,9 @@ static enum bp_result encoder_control_digx_v4(
struct bios_parser *bp,
struct bp_encoder_control *cntl);
-#ifdef LATEST_ATOM_BIOS_SUPPORT
static enum bp_result encoder_control_digx_v5(
struct bios_parser *bp,
struct bp_encoder_control *cntl);
-#endif
static void init_encoder_control_dig_v1(struct bios_parser *bp);
@@ -136,11 +134,9 @@ static void init_dig_encoder_control(struct bios_parser *bp)
bp->cmd_tbl.dig_encoder_control = encoder_control_digx_v4;
break;
-#ifdef LATEST_ATOM_BIOS_SUPPORT
case 5:
bp->cmd_tbl.dig_encoder_control = encoder_control_digx_v5;
break;
-#endif
default:
init_encoder_control_dig_v1(bp);
@@ -290,7 +286,6 @@ static enum bp_result encoder_control_digx_v4(
return result;
}
-#ifdef LATEST_ATOM_BIOS_SUPPORT
static enum bp_result encoder_control_digx_v5(
struct bios_parser *bp,
struct bp_encoder_control *cntl)
@@ -348,7 +343,6 @@ static enum bp_result encoder_control_digx_v5(
return result;
}
-#endif
/*******************************************************************************
********************************************************************************
@@ -829,7 +823,6 @@ static enum bp_result transmitter_control_v1_6(
struct bp_transmitter_control *cntl)
{
enum bp_result result = BP_RESULT_FAILURE;
-#ifdef LATEST_ATOM_BIOS_SUPPORT
const struct command_table_helper *cmd = bp->cmd_helper;
DIG_TRANSMITTER_CONTROL_PARAMETERS_V1_6 params;
@@ -883,7 +876,6 @@ static enum bp_result transmitter_control_v1_6(
if (EXEC_BIOS_CMD_TABLE(UNIPHYTransmitterControl, params))
result = BP_RESULT_OK;
-#endif
return result;
}
@@ -1141,7 +1133,6 @@ static enum bp_result set_pixel_clock_v7(
struct bp_pixel_clock_parameters *bp_params)
{
enum bp_result result = BP_RESULT_FAILURE;
-#ifdef LATEST_ATOM_BIOS_SUPPORT
PIXEL_CLOCK_PARAMETERS_V7 clk;
uint8_t controller_id;
uint32_t pll_id;
@@ -1203,7 +1194,6 @@ static enum bp_result set_pixel_clock_v7(
if (EXEC_BIOS_CMD_TABLE(SetPixelClock, clk))
result = BP_RESULT_OK;
}
-#endif
return result;
}
@@ -2539,15 +2529,12 @@ static enum bp_result enable_disp_power_gating_v2_1(
**
********************************************************************************
*******************************************************************************/
-#ifdef LATEST_ATOM_BIOS_SUPPORT
static enum bp_result set_dce_clock_v2_1(
struct bios_parser *bp,
struct bp_set_dce_clock_parameters *bp_params);
-#endif
static void init_set_dce_clock(struct bios_parser *bp)
{
-#ifdef LATEST_ATOM_BIOS_SUPPORT
switch (BIOS_CMD_TABLE_PARA_REVISION(SetDCEClock)) {
case 1:
bp->cmd_tbl.set_dce_clock = set_dce_clock_v2_1;
@@ -2556,10 +2543,8 @@ static void init_set_dce_clock(struct bios_parser *bp)
bp->cmd_tbl.set_dce_clock = NULL;
break;
}
-#endif
}
-#ifdef LATEST_ATOM_BIOS_SUPPORT
static enum bp_result set_dce_clock_v2_1(
struct bios_parser *bp,
struct bp_set_dce_clock_parameters *bp_params)
@@ -2606,4 +2591,3 @@ static enum bp_result set_dce_clock_v2_1(
return result;
}
-#endif
--
2.7.4
|
