From c635964c79b9d7d677a739f095655138296a5583 Mon Sep 17 00:00:00 2001 From: Jordan Lazare Date: Thu, 21 Jan 2016 13:42:16 -0500 Subject: [PATCH 0716/1110] drm/amd/dal: Remove the CZ_BRINGUP flag Signed-off-by: Jordan Lazare Acked-by: Harry Wentland --- drivers/gpu/drm/amd/dal/Makefile | 2 +- drivers/gpu/drm/amd/dal/dc/adapter/adapter_service.c | 12 +----------- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/drivers/gpu/drm/amd/dal/Makefile b/drivers/gpu/drm/amd/dal/Makefile index d5db32e..25ae464 100644 --- a/drivers/gpu/drm/amd/dal/Makefile +++ b/drivers/gpu/drm/amd/dal/Makefile @@ -7,7 +7,7 @@ AMDDALPATH = $(RELATIVE_AMD_DAL_PATH) subdir-ccflags-y += -Werror -subdir-ccflags-y += -I$(AMDDALPATH)/ -I$(AMDDALPATH)/include -DDAL_CZ_BRINGUP +subdir-ccflags-y += -I$(AMDDALPATH)/ -I$(AMDDALPATH)/include subdir-ccflags-y += -I$(FULL_AMD_DAL_PATH)/dc/inc/ diff --git a/drivers/gpu/drm/amd/dal/dc/adapter/adapter_service.c b/drivers/gpu/drm/amd/dal/dc/adapter/adapter_service.c index 17a9d2c..941d304 100644 --- a/drivers/gpu/drm/amd/dal/dc/adapter/adapter_service.c +++ b/drivers/gpu/drm/amd/dal/dc/adapter/adapter_service.c @@ -69,11 +69,7 @@ * makes it an int type. */ -static -#if !defined(DAL_CZ_BRINGUP) -const -#endif -struct feature_source_entry feature_entry_table[] = { +static struct feature_source_entry feature_entry_table[] = { /* Feature name | default value | is boolean type */ {FEATURE_ENABLE_HW_EDID_POLLING, false, true}, {FEATURE_DP_SINK_DETECT_POLL_DATA_PIN, false, true}, @@ -96,11 +92,7 @@ struct feature_source_entry feature_entry_table[] = { * Driver uses SW I2C. * Make Test uses HW I2C. */ -#if defined(DAL_CZ_BRINGUP) {FEATURE_RESTORE_USAGE_I2C_SW_ENGINE, true, true}, -#else - {FEATURE_RESTORE_USAGE_I2C_SW_ENGINE, false, true}, -#endif {FEATURE_USE_MAX_DISPLAY_CLK, false, true}, {FEATURE_ALLOW_EDP_RESOURCE_SHARING, false, true}, {FEATURE_SUPPORT_DP_YUV, false, true}, @@ -740,7 +732,6 @@ static bool adapter_service_construct( return false; } -#if defined(DAL_CZ_BRINGUP) if (dal_adapter_service_get_dce_version(as) == DCE_VERSION_11_0) { uint32_t i; @@ -753,7 +744,6 @@ static bool adapter_service_construct( feature_entry_table[i].default_value = true; } } -#endif /* Generate feature set table */ if (!generate_feature_set(as, init_data->display_param)) { -- 2.7.4