Commit 6f2bde9b authored by Rodrigo Siqueira's avatar Rodrigo Siqueira Committed by Alex Deucher

drm/amd/display: Add missing static

After enable DRM_AMDGPU_WERROR, clang highlight multiple functions that
need to have `static`, and this commit address those issues and also
improve the indents.
Reviewed-by: default avatarHamza Mahfooz <hamza.mahfooz@amd.com>
Acked-by: default avatarAlan Liu <haoping.liu@amd.com>
Signed-off-by: default avatarRodrigo Siqueira <rodrigo.siqueira@amd.com>
Tested-by: default avatarDaniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent c324065c
...@@ -50,12 +50,11 @@ bool dal_vector_construct( ...@@ -50,12 +50,11 @@ bool dal_vector_construct(
return true; return true;
} }
static bool dal_vector_presized_costruct( static bool dal_vector_presized_costruct(struct vector *vector,
struct vector *vector, struct dc_context *ctx,
struct dc_context *ctx, uint32_t count,
uint32_t count, void *initial_value,
void *initial_value, uint32_t struct_size)
uint32_t struct_size)
{ {
uint32_t i; uint32_t i;
......
...@@ -2593,11 +2593,10 @@ static struct integrated_info *bios_parser_create_integrated_info( ...@@ -2593,11 +2593,10 @@ static struct integrated_info *bios_parser_create_integrated_info(
return NULL; return NULL;
} }
static enum bp_result update_slot_layout_info( static enum bp_result update_slot_layout_info(struct dc_bios *dcb,
struct dc_bios *dcb, unsigned int i,
unsigned int i, struct slot_layout_info *slot_layout_info,
struct slot_layout_info *slot_layout_info, unsigned int record_offset)
unsigned int record_offset)
{ {
unsigned int j; unsigned int j;
struct bios_parser *bp; struct bios_parser *bp;
...@@ -2696,10 +2695,9 @@ static enum bp_result update_slot_layout_info( ...@@ -2696,10 +2695,9 @@ static enum bp_result update_slot_layout_info(
} }
static enum bp_result get_bracket_layout_record( static enum bp_result get_bracket_layout_record(struct dc_bios *dcb,
struct dc_bios *dcb, unsigned int bracket_layout_id,
unsigned int bracket_layout_id, struct slot_layout_info *slot_layout_info)
struct slot_layout_info *slot_layout_info)
{ {
unsigned int i; unsigned int i;
unsigned int record_offset; unsigned int record_offset;
......
...@@ -340,9 +340,8 @@ static struct atom_display_object_path_v2 *get_bios_object( ...@@ -340,9 +340,8 @@ static struct atom_display_object_path_v2 *get_bios_object(
} }
/* from graphics_object_id, find display path which includes the object_id */ /* from graphics_object_id, find display path which includes the object_id */
static struct atom_display_object_path_v3 *get_bios_object_from_path_v3( static struct atom_display_object_path_v3 *get_bios_object_from_path_v3(struct bios_parser *bp,
struct bios_parser *bp, struct graphics_object_id id)
struct graphics_object_id id)
{ {
unsigned int i; unsigned int i;
struct graphics_object_id obj_id = {0}; struct graphics_object_id obj_id = {0};
...@@ -521,9 +520,8 @@ static enum bp_result get_gpio_i2c_info( ...@@ -521,9 +520,8 @@ static enum bp_result get_gpio_i2c_info(
return BP_RESULT_OK; return BP_RESULT_OK;
} }
static struct atom_hpd_int_record *get_hpd_record_for_path_v3( static struct atom_hpd_int_record *get_hpd_record_for_path_v3(struct bios_parser *bp,
struct bios_parser *bp, struct atom_display_object_path_v3 *object)
struct atom_display_object_path_v3 *object)
{ {
struct atom_common_record_header *header; struct atom_common_record_header *header;
uint32_t offset; uint32_t offset;
...@@ -2175,9 +2173,8 @@ static struct atom_disp_connector_caps_record *get_disp_connector_caps_record( ...@@ -2175,9 +2173,8 @@ static struct atom_disp_connector_caps_record *get_disp_connector_caps_record(
return NULL; return NULL;
} }
static struct atom_connector_caps_record *get_connector_caps_record( static struct atom_connector_caps_record *get_connector_caps_record(struct bios_parser *bp,
struct bios_parser *bp, struct atom_display_object_path_v3 *object)
struct atom_display_object_path_v3 *object)
{ {
struct atom_common_record_header *header; struct atom_common_record_header *header;
uint32_t offset; uint32_t offset;
...@@ -2264,9 +2261,8 @@ static enum bp_result bios_parser_get_disp_connector_caps_info( ...@@ -2264,9 +2261,8 @@ static enum bp_result bios_parser_get_disp_connector_caps_info(
return BP_RESULT_OK; return BP_RESULT_OK;
} }
static struct atom_connector_speed_record *get_connector_speed_cap_record( static struct atom_connector_speed_record *get_connector_speed_cap_record(struct bios_parser *bp,
struct bios_parser *bp, struct atom_display_object_path_v3 *object)
struct atom_display_object_path_v3 *object)
{ {
struct atom_common_record_header *header; struct atom_common_record_header *header;
uint32_t offset; uint32_t offset;
......
...@@ -1047,8 +1047,10 @@ static void disable_all_writeback_pipes_for_stream( ...@@ -1047,8 +1047,10 @@ static void disable_all_writeback_pipes_for_stream(
stream->writeback_info[i].wb_enabled = false; stream->writeback_info[i].wb_enabled = false;
} }
static void apply_ctx_interdependent_lock(struct dc *dc, struct dc_state *context, static void apply_ctx_interdependent_lock(struct dc *dc,
struct dc_stream_state *stream, bool lock) struct dc_state *context,
struct dc_stream_state *stream,
bool lock)
{ {
int i; int i;
......
...@@ -187,6 +187,7 @@ static bool is_ycbcr709_limited_type( ...@@ -187,6 +187,7 @@ static bool is_ycbcr709_limited_type(
ret = true; ret = true;
return ret; return ret;
} }
static enum dc_color_space_type get_color_space_type(enum dc_color_space color_space) static enum dc_color_space_type get_color_space_type(enum dc_color_space color_space)
{ {
enum dc_color_space_type type = COLOR_SPACE_RGB_TYPE; enum dc_color_space_type type = COLOR_SPACE_RGB_TYPE;
......
...@@ -76,9 +76,9 @@ static bool dce_dmcu_init(struct dmcu *dmcu) ...@@ -76,9 +76,9 @@ static bool dce_dmcu_init(struct dmcu *dmcu)
} }
static bool dce_dmcu_load_iram(struct dmcu *dmcu, static bool dce_dmcu_load_iram(struct dmcu *dmcu,
unsigned int start_offset, unsigned int start_offset,
const char *src, const char *src,
unsigned int bytes) unsigned int bytes)
{ {
struct dce_dmcu *dmcu_dce = TO_DCE_DMCU(dmcu); struct dce_dmcu *dmcu_dce = TO_DCE_DMCU(dmcu);
unsigned int count = 0; unsigned int count = 0;
......
...@@ -442,10 +442,9 @@ struct dce_i2c_hw *acquire_i2c_hw_engine( ...@@ -442,10 +442,9 @@ struct dce_i2c_hw *acquire_i2c_hw_engine(
return dce_i2c_hw; return dce_i2c_hw;
} }
static enum i2c_channel_operation_result dce_i2c_hw_engine_wait_on_operation_result( static enum i2c_channel_operation_result dce_i2c_hw_engine_wait_on_operation_result(struct dce_i2c_hw *dce_i2c_hw,
struct dce_i2c_hw *dce_i2c_hw, uint32_t timeout,
uint32_t timeout, enum i2c_channel_operation_result expected_result)
enum i2c_channel_operation_result expected_result)
{ {
enum i2c_channel_operation_result result; enum i2c_channel_operation_result result;
uint32_t i = 0; uint32_t i = 0;
...@@ -509,11 +508,10 @@ static uint32_t get_transaction_timeout_hw( ...@@ -509,11 +508,10 @@ static uint32_t get_transaction_timeout_hw(
return period_timeout * num_of_clock_stretches; return period_timeout * num_of_clock_stretches;
} }
static bool dce_i2c_hw_engine_submit_payload( static bool dce_i2c_hw_engine_submit_payload(struct dce_i2c_hw *dce_i2c_hw,
struct dce_i2c_hw *dce_i2c_hw, struct i2c_payload *payload,
struct i2c_payload *payload, bool middle_of_transaction,
bool middle_of_transaction, uint32_t speed)
uint32_t speed)
{ {
struct i2c_request_transaction_data request; struct i2c_request_transaction_data request;
......
...@@ -367,6 +367,7 @@ static bool dce_i2c_sw_engine_acquire_engine( ...@@ -367,6 +367,7 @@ static bool dce_i2c_sw_engine_acquire_engine(
return true; return true;
} }
bool dce_i2c_engine_acquire_sw( bool dce_i2c_engine_acquire_sw(
struct dce_i2c_sw *dce_i2c_sw, struct dce_i2c_sw *dce_i2c_sw,
struct ddc *ddc_handle) struct ddc *ddc_handle)
...@@ -392,12 +393,8 @@ bool dce_i2c_engine_acquire_sw( ...@@ -392,12 +393,8 @@ bool dce_i2c_engine_acquire_sw(
return result; return result;
} }
static void dce_i2c_sw_engine_submit_channel_request(struct dce_i2c_sw *engine,
struct i2c_request_transaction_data *req)
static void dce_i2c_sw_engine_submit_channel_request(
struct dce_i2c_sw *engine,
struct i2c_request_transaction_data *req)
{ {
struct ddc *ddc = engine->ddc; struct ddc *ddc = engine->ddc;
uint16_t clock_delay_div_4 = engine->clock_delay >> 2; uint16_t clock_delay_div_4 = engine->clock_delay >> 2;
...@@ -439,10 +436,9 @@ static void dce_i2c_sw_engine_submit_channel_request( ...@@ -439,10 +436,9 @@ static void dce_i2c_sw_engine_submit_channel_request(
I2C_CHANNEL_OPERATION_FAILED; I2C_CHANNEL_OPERATION_FAILED;
} }
static bool dce_i2c_sw_engine_submit_payload( static bool dce_i2c_sw_engine_submit_payload(struct dce_i2c_sw *engine,
struct dce_i2c_sw *engine, struct i2c_payload *payload,
struct i2c_payload *payload, bool middle_of_transaction)
bool middle_of_transaction)
{ {
struct i2c_request_transaction_data request; struct i2c_request_transaction_data request;
......
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
#define DC_LOGGER \ #define DC_LOGGER \
dccg->ctx->logger dccg->ctx->logger
void dccg21_update_dpp_dto(struct dccg *dccg, int dpp_inst, int req_dppclk) static void dccg21_update_dpp_dto(struct dccg *dccg, int dpp_inst, int req_dppclk)
{ {
struct dcn_dccg *dccg_dcn = TO_DCN_DCCG(dccg); struct dcn_dccg *dccg_dcn = TO_DCN_DCCG(dccg);
......
...@@ -32,6 +32,5 @@ struct dccg *dccg21_create( ...@@ -32,6 +32,5 @@ struct dccg *dccg21_create(
const struct dccg_shift *dccg_shift, const struct dccg_shift *dccg_shift,
const struct dccg_mask *dccg_mask); const struct dccg_mask *dccg_mask);
void dccg21_update_dpp_dto(struct dccg *dccg, int dpp_inst, int req_dppclk);
#endif /* __DCN21_DCCG_H__ */ #endif /* __DCN21_DCCG_H__ */
...@@ -38,10 +38,9 @@ ...@@ -38,10 +38,9 @@
#define DCN_BASE__INST0_SEG2 0x000034C0 #define DCN_BASE__INST0_SEG2 0x000034C0
static enum dc_irq_source to_dal_irq_source_dcn314( static enum dc_irq_source to_dal_irq_source_dcn314(struct irq_service *irq_service,
struct irq_service *irq_service, uint32_t src_id,
uint32_t src_id, uint32_t ext_id)
uint32_t ext_id)
{ {
switch (src_id) { switch (src_id) {
case DCN_1_0__SRCID__DC_D1_OTG_VSTARTUP: case DCN_1_0__SRCID__DC_D1_OTG_VSTARTUP:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment