Skip to content

Commit

Permalink
drm/amd/display: Add missing static
Browse files Browse the repository at this point in the history
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: Hamza Mahfooz <[email protected]>
Acked-by: Alan Liu <[email protected]>
Signed-off-by: Rodrigo Siqueira <[email protected]>
Tested-by: Daniel Wheeler <[email protected]>
Signed-off-by: Alex Deucher <[email protected]>
  • Loading branch information
rodrigosiqueira authored and alexdeucher committed Jul 18, 2023
1 parent c324065 commit 6f2bde9
Show file tree
Hide file tree
Showing 11 changed files with 45 additions and 57 deletions.
11 changes: 5 additions & 6 deletions drivers/gpu/drm/amd/display/dc/basics/vector.c
Original file line number Diff line number Diff line change
Expand Up @@ -50,12 +50,11 @@ bool dal_vector_construct(
return true;
}

static bool dal_vector_presized_costruct(
struct vector *vector,
struct dc_context *ctx,
uint32_t count,
void *initial_value,
uint32_t struct_size)
static bool dal_vector_presized_costruct(struct vector *vector,
struct dc_context *ctx,
uint32_t count,
void *initial_value,
uint32_t struct_size)
{
uint32_t i;

Expand Down
16 changes: 7 additions & 9 deletions drivers/gpu/drm/amd/display/dc/bios/bios_parser.c
Original file line number Diff line number Diff line change
Expand Up @@ -2593,11 +2593,10 @@ static struct integrated_info *bios_parser_create_integrated_info(
return NULL;
}

static enum bp_result update_slot_layout_info(
struct dc_bios *dcb,
unsigned int i,
struct slot_layout_info *slot_layout_info,
unsigned int record_offset)
static enum bp_result update_slot_layout_info(struct dc_bios *dcb,
unsigned int i,
struct slot_layout_info *slot_layout_info,
unsigned int record_offset)
{
unsigned int j;
struct bios_parser *bp;
Expand Down Expand Up @@ -2696,10 +2695,9 @@ static enum bp_result update_slot_layout_info(
}


static enum bp_result get_bracket_layout_record(
struct dc_bios *dcb,
unsigned int bracket_layout_id,
struct slot_layout_info *slot_layout_info)
static enum bp_result get_bracket_layout_record(struct dc_bios *dcb,
unsigned int bracket_layout_id,
struct slot_layout_info *slot_layout_info)
{
unsigned int i;
unsigned int record_offset;
Expand Down
20 changes: 8 additions & 12 deletions drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
static struct atom_display_object_path_v3 *get_bios_object_from_path_v3(
struct bios_parser *bp,
struct graphics_object_id id)
static struct atom_display_object_path_v3 *get_bios_object_from_path_v3(struct bios_parser *bp,
struct graphics_object_id id)
{
unsigned int i;
struct graphics_object_id obj_id = {0};
Expand Down Expand Up @@ -521,9 +520,8 @@ static enum bp_result get_gpio_i2c_info(
return BP_RESULT_OK;
}

static struct atom_hpd_int_record *get_hpd_record_for_path_v3(
struct bios_parser *bp,
struct atom_display_object_path_v3 *object)
static struct atom_hpd_int_record *get_hpd_record_for_path_v3(struct bios_parser *bp,
struct atom_display_object_path_v3 *object)
{
struct atom_common_record_header *header;
uint32_t offset;
Expand Down Expand Up @@ -2175,9 +2173,8 @@ static struct atom_disp_connector_caps_record *get_disp_connector_caps_record(
return NULL;
}

static struct atom_connector_caps_record *get_connector_caps_record(
struct bios_parser *bp,
struct atom_display_object_path_v3 *object)
static struct atom_connector_caps_record *get_connector_caps_record(struct bios_parser *bp,
struct atom_display_object_path_v3 *object)
{
struct atom_common_record_header *header;
uint32_t offset;
Expand Down Expand Up @@ -2264,9 +2261,8 @@ static enum bp_result bios_parser_get_disp_connector_caps_info(
return BP_RESULT_OK;
}

static struct atom_connector_speed_record *get_connector_speed_cap_record(
struct bios_parser *bp,
struct atom_display_object_path_v3 *object)
static struct atom_connector_speed_record *get_connector_speed_cap_record(struct bios_parser *bp,
struct atom_display_object_path_v3 *object)
{
struct atom_common_record_header *header;
uint32_t offset;
Expand Down
6 changes: 4 additions & 2 deletions drivers/gpu/drm/amd/display/dc/core/dc.c
Original file line number Diff line number Diff line change
Expand Up @@ -1047,8 +1047,10 @@ static void disable_all_writeback_pipes_for_stream(
stream->writeback_info[i].wb_enabled = false;
}

static void apply_ctx_interdependent_lock(struct dc *dc, struct dc_state *context,
struct dc_stream_state *stream, bool lock)
static void apply_ctx_interdependent_lock(struct dc *dc,
struct dc_state *context,
struct dc_stream_state *stream,
bool lock)
{
int i;

Expand Down
1 change: 1 addition & 0 deletions drivers/gpu/drm/amd/display/dc/core/dc_hw_sequencer.c
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,7 @@ static bool is_ycbcr709_limited_type(
ret = true;
return ret;
}

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;
Expand Down
6 changes: 3 additions & 3 deletions drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.c
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,9 @@ static bool dce_dmcu_init(struct dmcu *dmcu)
}

static bool dce_dmcu_load_iram(struct dmcu *dmcu,
unsigned int start_offset,
const char *src,
unsigned int bytes)
unsigned int start_offset,
const char *src,
unsigned int bytes)
{
struct dce_dmcu *dmcu_dce = TO_DCE_DMCU(dmcu);
unsigned int count = 0;
Expand Down
16 changes: 7 additions & 9 deletions drivers/gpu/drm/amd/display/dc/dce/dce_i2c_hw.c
Original file line number Diff line number Diff line change
Expand Up @@ -442,10 +442,9 @@ struct dce_i2c_hw *acquire_i2c_hw_engine(
return dce_i2c_hw;
}

static enum i2c_channel_operation_result dce_i2c_hw_engine_wait_on_operation_result(
struct dce_i2c_hw *dce_i2c_hw,
uint32_t timeout,
enum i2c_channel_operation_result expected_result)
static enum i2c_channel_operation_result dce_i2c_hw_engine_wait_on_operation_result(struct dce_i2c_hw *dce_i2c_hw,
uint32_t timeout,
enum i2c_channel_operation_result expected_result)
{
enum i2c_channel_operation_result result;
uint32_t i = 0;
Expand Down Expand Up @@ -509,11 +508,10 @@ static uint32_t get_transaction_timeout_hw(
return period_timeout * num_of_clock_stretches;
}

static bool dce_i2c_hw_engine_submit_payload(
struct dce_i2c_hw *dce_i2c_hw,
struct i2c_payload *payload,
bool middle_of_transaction,
uint32_t speed)
static bool dce_i2c_hw_engine_submit_payload(struct dce_i2c_hw *dce_i2c_hw,
struct i2c_payload *payload,
bool middle_of_transaction,
uint32_t speed)
{

struct i2c_request_transaction_data request;
Expand Down
16 changes: 6 additions & 10 deletions drivers/gpu/drm/amd/display/dc/dce/dce_i2c_sw.c
Original file line number Diff line number Diff line change
Expand Up @@ -367,6 +367,7 @@ static bool dce_i2c_sw_engine_acquire_engine(

return true;
}

bool dce_i2c_engine_acquire_sw(
struct dce_i2c_sw *dce_i2c_sw,
struct ddc *ddc_handle)
Expand All @@ -392,12 +393,8 @@ bool dce_i2c_engine_acquire_sw(
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;
uint16_t clock_delay_div_4 = engine->clock_delay >> 2;
Expand Down Expand Up @@ -439,10 +436,9 @@ static void dce_i2c_sw_engine_submit_channel_request(
I2C_CHANNEL_OPERATION_FAILED;
}

static bool dce_i2c_sw_engine_submit_payload(
struct dce_i2c_sw *engine,
struct i2c_payload *payload,
bool middle_of_transaction)
static bool dce_i2c_sw_engine_submit_payload(struct dce_i2c_sw *engine,
struct i2c_payload *payload,
bool middle_of_transaction)
{
struct i2c_request_transaction_data request;

Expand Down
2 changes: 1 addition & 1 deletion drivers/gpu/drm/amd/display/dc/dcn21/dcn21_dccg.c
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
#define DC_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);

Expand Down
1 change: 0 additions & 1 deletion drivers/gpu/drm/amd/display/dc/dcn21/dcn21_dccg.h
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,5 @@ struct dccg *dccg21_create(
const struct dccg_shift *dccg_shift,
const struct dccg_mask *dccg_mask);

void dccg21_update_dpp_dto(struct dccg *dccg, int dpp_inst, int req_dppclk);

#endif /* __DCN21_DCCG_H__ */
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,9 @@

#define DCN_BASE__INST0_SEG2 0x000034C0

static enum dc_irq_source to_dal_irq_source_dcn314(
struct irq_service *irq_service,
uint32_t src_id,
uint32_t ext_id)
static enum dc_irq_source to_dal_irq_source_dcn314(struct irq_service *irq_service,
uint32_t src_id,
uint32_t ext_id)
{
switch (src_id) {
case DCN_1_0__SRCID__DC_D1_OTG_VSTARTUP:
Expand Down

0 comments on commit 6f2bde9

Please sign in to comment.