Commit a9beb6c7 authored by Harry Wentland's avatar Harry Wentland Committed by Alex Deucher
Browse files

drm/amd/display: Remove unnecessary dc_link vtable 



None of this needs to be a function table or dynamic in any way.

Signed-off-by: default avatarHarry Wentland <harry.wentland@amd.com>
Reviewed-by: default avatarTony Cheng <Tony.Cheng@amd.com>
Acked-by: default avatarHarry Wentland <harry.wentland@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 125d10a2

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

+0 −89
Original line number Diff line number Diff line
@@ -239,93 +239,6 @@ void dc_stream_set_static_screen_events(struct dc *dc, 
	dc->hwss.set_static_screen_control(pipes_affected, num_pipes_affected, events);

}



static void set_drive_settings(struct dc *dc,

		struct link_training_settings *lt_settings,

		const struct dc_link *link)

{



	int i;



	for (i = 0; i < dc->link_count; i++) {

		if (dc->links[i] == link)

			break;

	}



	if (i >= dc->link_count)

		ASSERT_CRITICAL(false);



	dc_link_dp_set_drive_settings(dc->links[i], lt_settings);

}



static void perform_link_training(struct dc *dc,

		struct dc_link_settings *link_setting,

		bool skip_video_pattern)

{

	int i;



	for (i = 0; i < dc->link_count; i++)

		dc_link_dp_perform_link_training(

			dc->links[i],

			link_setting,

			skip_video_pattern);

}



static void set_preferred_link_settings(struct dc *dc,

		struct dc_link_settings *link_setting,

		struct dc_link *link)

{

	link->preferred_link_setting = *link_setting;

	dp_retrain_link_dp_test(link, link_setting, false);

}



static void enable_hpd(const struct dc_link *link)

{

	dc_link_dp_enable_hpd(link);

}



static void disable_hpd(const struct dc_link *link)

{

	dc_link_dp_disable_hpd(link);

}





static void set_test_pattern(

		struct dc_link *link,

		enum dp_test_pattern test_pattern,

		const struct link_training_settings *p_link_settings,

		const unsigned char *p_custom_pattern,

		unsigned int cust_pattern_size)

{

	if (link != NULL)

		dc_link_dp_set_test_pattern(

			link,

			test_pattern,

			p_link_settings,

			p_custom_pattern,

			cust_pattern_size);

}



static void allocate_dc_stream_funcs(struct dc  *dc)

{

	dc->link_funcs.set_drive_settings =

			set_drive_settings;



	dc->link_funcs.perform_link_training =

			perform_link_training;



	dc->link_funcs.set_preferred_link_settings =

			set_preferred_link_settings;



	dc->link_funcs.enable_hpd =

			enable_hpd;



	dc->link_funcs.disable_hpd =

			disable_hpd;



	dc->link_funcs.set_test_pattern =

			set_test_pattern;

}



static void destruct(struct dc *dc)

{

	dc_release_state(dc->current_state);
@@ -502,8 +415,6 @@ static bool construct(struct dc *dc, 
	if (!create_links(dc, init_params->num_virtual_links))

		goto fail;



	allocate_dc_stream_funcs(dc);



	return true;



fail:

drivers/gpu/drm/amd/display/dc/dc.h

+0 −20
Original line number Diff line number Diff line
@@ -146,25 +146,6 @@ struct dc_cap_funcs { 


struct link_training_settings;



struct dc_link_funcs {

	void (*set_drive_settings)(struct dc *dc,

			struct link_training_settings *lt_settings,

			const struct dc_link *link);

	void (*perform_link_training)(struct dc *dc,

			struct dc_link_settings *link_setting,

			bool skip_video_pattern);

	void (*set_preferred_link_settings)(struct dc *dc,

			struct dc_link_settings *link_setting,

			struct dc_link *link);

	void (*enable_hpd)(const struct dc_link *link);

	void (*disable_hpd)(const struct dc_link *link);

	void (*set_test_pattern)(

			struct dc_link *link,

			enum dp_test_pattern test_pattern,

			const struct link_training_settings *p_link_settings,

			const unsigned char *p_custom_pattern,

			unsigned int cust_pattern_size);

};



/* Structure to hold configuration flags set by dm at dc creation. */

struct dc_config {
@@ -237,7 +218,6 @@ struct dce_hwseq; 
struct dc {

	struct dc_caps caps;

	struct dc_cap_funcs cap_funcs;

	struct dc_link_funcs link_funcs;

	struct dc_config config;

	struct dc_debug debug;