Commit d9e32672 authored by Anthony Koo's avatar Anthony Koo Committed by Alex Deucher
Browse files

drm/amd/display: cleanup of construct and destruct funcs 



[Why]
Too many construct functions which makes searching
difficult, especially on some debuggers.

[How]
Append all construct and destruct functions with dcn
number and object type to make each construct function
name unique

Signed-off-by: default avatarAnthony Koo <Anthony.Koo@amd.com>
Reviewed-by: default avatarAric Cyr <Aric.Cyr@amd.com>
Acked-by: default avatarRodrigo Siqueira <Rodrigo.Siqueira@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 03527f0d

drivers/gpu/drm/amd/display/dc/bios/bios_parser.c

+2 −2
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ struct dc_bios *bios_parser_create( 
	return NULL;

}



static void destruct(struct bios_parser *bp)

static void bios_parser_destruct(struct bios_parser *bp)

{

	kfree(bp->base.bios_local_image);

	kfree(bp->base.integrated_info);
@@ -126,7 +126,7 @@ static void bios_parser_destroy(struct dc_bios **dcb) 
		return;

	}



	destruct(bp);

	bios_parser_destruct(bp);



	kfree(bp);

	*dcb = NULL;

drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c

+4 −4
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ static struct atom_encoder_caps_record *get_encoder_cap_record( 


#define DATA_TABLES(table) (bp->master_data_tbl->listOfdatatables.table)



static void destruct(struct bios_parser *bp)

static void bios_parser2_destruct(struct bios_parser *bp)

{

	kfree(bp->base.bios_local_image);

	kfree(bp->base.integrated_info);
@@ -126,7 +126,7 @@ static void firmware_parser_destroy(struct dc_bios **dcb) 
		return;

	}



	destruct(bp);

	bios_parser2_destruct(bp);



	kfree(bp);

	*dcb = NULL;
@@ -1925,7 +1925,7 @@ static const struct dc_vbios_funcs vbios_funcs = { 
	.get_board_layout_info = bios_get_board_layout_info,

};



static bool bios_parser_construct(

static bool bios_parser2_construct(

	struct bios_parser *bp,

	struct bp_init_data *init,

	enum dce_version dce_version)
@@ -2018,7 +2018,7 @@ struct dc_bios *firmware_parser_create( 
	if (!bp)

		return NULL;



	if (bios_parser_construct(bp, init, dce_version))

	if (bios_parser2_construct(bp, init, dce_version))

		return &bp->base;



	kfree(bp);

drivers/gpu/drm/amd/display/dc/core/dc.c

+5 −5
Original line number Diff line number Diff line
@@ -533,7 +533,7 @@ void dc_stream_set_static_screen_events(struct dc *dc, 
	dc->hwss.set_static_screen_control(pipes_affected, num_pipes_affected, events);

}



static void destruct(struct dc *dc)

static void dc_destruct(struct dc *dc)

{

	if (dc->current_state) {

		dc_release_state(dc->current_state);
@@ -579,7 +579,7 @@ static void destruct(struct dc *dc) 


}



static bool construct(struct dc *dc,

static bool dc_construct(struct dc *dc,

		const struct dc_init_data *init_params)

{

	struct dc_context *dc_ctx;
@@ -729,7 +729,7 @@ static bool construct(struct dc *dc, 


fail:



	destruct(dc);

	dc_destruct(dc);

	return false;

}
@@ -795,7 +795,7 @@ struct dc *dc_create(const struct dc_init_data *init_params) 
	if (NULL == dc)

		goto alloc_fail;



	if (false == construct(dc, init_params))

	if (false == dc_construct(dc, init_params))

		goto construct_fail;



	full_pipe_count = dc->res_pool->pipe_count;
@@ -852,7 +852,7 @@ void dc_deinit_callbacks(struct dc *dc) 


void dc_destroy(struct dc **dc)

{

	destruct(*dc);

	dc_destruct(*dc);

	kfree(*dc);

	*dc = NULL;

}

drivers/gpu/drm/amd/display/dc/core/dc_link.c

+4 −4
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ enum { 
/*******************************************************************************

 * Private functions

 ******************************************************************************/

static void destruct(struct dc_link *link)

static void dc_link_destruct(struct dc_link *link)

{

	int i;
@@ -1244,7 +1244,7 @@ static enum transmitter translate_encoder_to_transmitter( 
	}

}



static bool construct(

static bool dc_link_construct(

	struct dc_link *link,

	const struct link_init_data *init_params)

{
@@ -1446,7 +1446,7 @@ struct dc_link *link_create(const struct link_init_data *init_params) 
	if (NULL == link)

		goto alloc_fail;



	if (false == construct(link, init_params))

	if (false == dc_link_construct(link, init_params))

		goto construct_fail;



	return link;
@@ -1460,7 +1460,7 @@ alloc_fail: 


void link_destroy(struct dc_link **link)

{

	destruct(*link);

	dc_link_destruct(*link);

	kfree(*link);

	*link = NULL;

}

drivers/gpu/drm/amd/display/dc/core/dc_link_ddc.c

+4 −4
Original line number Diff line number Diff line
@@ -187,7 +187,7 @@ void dal_ddc_i2c_payloads_add( 


}



static void construct(

static void ddc_service_construct(

	struct ddc_service *ddc_service,

	struct ddc_service_init_data *init_data)

{
@@ -239,11 +239,11 @@ struct ddc_service *dal_ddc_service_create( 
	if (!ddc_service)

		return NULL;



	construct(ddc_service, init_data);

	ddc_service_construct(ddc_service, init_data);

	return ddc_service;

}



static void destruct(struct ddc_service *ddc)

static void ddc_service_destruct(struct ddc_service *ddc)

{

	if (ddc->ddc_pin)

		dal_gpio_destroy_ddc(&ddc->ddc_pin);
@@ -255,7 +255,7 @@ void dal_ddc_service_destroy(struct ddc_service **ddc) 
		BREAK_TO_DEBUGGER();

		return;

	}

	destruct(*ddc);

	ddc_service_destruct(*ddc);

	kfree(*ddc);

	*ddc = NULL;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE