[5/7] drm/amd/display: Remove obsolete LATEST_ATOM_BIOS_SUPPORT

Submitted by Harry Wentland on Dec. 2, 2016, 3:12 p.m.

Details

Message ID 20161202151234.31267-6-harry.wentland@amd.com
State New
Headers show
Series "dal patches for dec 2, 2016" ( rev: 1 ) in AMD X.Org drivers

Not browsing as part of any series.

Commit Message

Harry Wentland Dec. 2, 2016, 3:12 p.m.
Change-Id: I12e580840fbdcc162303dc4c66d9d8fc12ecbacd
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>
---
 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(-)

Patch hide | download patch | download mbox

diff --git a/drivers/gpu/drm/amd/display/dc/bios/Makefile b/drivers/gpu/drm/amd/display/dc/bios/Makefile
index 20480d6e2a02..1368e4995ed2 100644
--- a/drivers/gpu/drm/amd/display/dc/bios/Makefile
+++ b/drivers/gpu/drm/amd/display/dc/bios/Makefile
@@ -20,5 +20,4 @@  AMD_DAL_FILES += $(AMDDALPATH)/dc/bios/dce80/command_table_helper_dce80.o
 ###############################################################################
 AMD_DAL_FILES += $(AMDDALPATH)/dc/bios/dce110/command_table_helper_dce110.o
 
-ccflags-y += -DLATEST_ATOM_BIOS_SUPPORT
 AMD_DAL_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 51f6052eac96..d0eedb6235fe 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