From b8b9cc711b944c1b2e328fb0eea504a0c99a1eb9 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Fri, 29 Sep 2017 17:13:29 +1000 Subject: [PATCH 2445/4131] amdgpu/dc: set some of the link dp code to static. These aren't currently used outside this file. Signed-off-by: Dave Airlie Reviewed-by: Harry Wentland --- drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 18 +++++++++++++----- drivers/gpu/drm/amd/display/dc/inc/dc_link_dp.h | 8 -------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c b/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c index 305ca0d..888d268 100644 --- a/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c +++ b/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c @@ -32,6 +32,14 @@ enum { LINK_TRAINING_MAX_CR_RETRY = 100 }; +static bool decide_fallback_link_setting( + struct dc_link_settings initial_link_settings, + struct dc_link_settings *current_link_setting, + enum link_training_result training_result); +static struct dc_link_settings get_common_supported_link_settings ( + struct dc_link_settings link_setting_a, + struct dc_link_settings link_setting_b); + static void wait_for_training_aux_rd_interval( struct dc_link *link, uint32_t default_wait_in_micro_secs) @@ -1150,7 +1158,7 @@ bool dp_hbr_verify_link_cap( return success; } -struct dc_link_settings get_common_supported_link_settings ( +static struct dc_link_settings get_common_supported_link_settings ( struct dc_link_settings link_setting_a, struct dc_link_settings link_setting_b) { @@ -1215,7 +1223,7 @@ enum dc_lane_count reduce_lane_count(enum dc_lane_count lane_count) } } -enum dc_link_rate reduce_link_rate(enum dc_link_rate link_rate) +static enum dc_link_rate reduce_link_rate(enum dc_link_rate link_rate) { switch (link_rate) { case LINK_RATE_HIGH3: @@ -1231,7 +1239,7 @@ enum dc_link_rate reduce_link_rate(enum dc_link_rate link_rate) } } -enum dc_lane_count increase_lane_count(enum dc_lane_count lane_count) +static enum dc_lane_count increase_lane_count(enum dc_lane_count lane_count) { switch (lane_count) { case LANE_COUNT_ONE: @@ -1243,7 +1251,7 @@ enum dc_lane_count increase_lane_count(enum dc_lane_count lane_count) } } -enum dc_link_rate increase_link_rate(enum dc_link_rate link_rate) +static enum dc_link_rate increase_link_rate(enum dc_link_rate link_rate) { switch (link_rate) { case LINK_RATE_LOW: @@ -1265,7 +1273,7 @@ enum dc_link_rate increase_link_rate(enum dc_link_rate link_rate) * false - has reached minimum setting * and no further fallback could be done */ -bool decide_fallback_link_setting( +static bool decide_fallback_link_setting( struct dc_link_settings initial_link_settings, struct dc_link_settings *current_link_setting, enum link_training_result training_result) diff --git a/drivers/gpu/drm/amd/display/dc/inc/dc_link_dp.h b/drivers/gpu/drm/amd/display/dc/inc/dc_link_dp.h index 7168dcc..616c73e 100644 --- a/drivers/gpu/drm/amd/display/dc/inc/dc_link_dp.h +++ b/drivers/gpu/drm/amd/display/dc/inc/dc_link_dp.h @@ -37,14 +37,6 @@ bool dp_hbr_verify_link_cap( struct dc_link *link, struct dc_link_settings *known_limit_link_setting); -bool decide_fallback_link_setting(struct dc_link_settings link_setting_init, - struct dc_link_settings *link_setting_current, - enum link_training_result training_result); - -struct dc_link_settings get_common_supported_link_settings ( - struct dc_link_settings link_setting_a, - struct dc_link_settings link_setting_b); - bool dp_validate_mode_timing( struct dc_link *link, const struct dc_crtc_timing *timing); -- 2.7.4