Commit 7ae1dbe6 authored by Wenjing Liu's avatar Wenjing Liu Committed by Alex Deucher
Browse files

drm/amd/display: merge dc_link.h into dc.h and dc_types.h 



[why]
Remove the need to include dc_link.h separately. dc.h should contain
everything needed on DM side.

[How]
Merge dc_link.h into dc.h and dc_types.h so DM only needs to include
dc.h to use all link public functions.

Reviewed-by: default avatarJun Lei <Jun.Lei@amd.com>
Acked-by: default avatarQingqing Zhuo <qingqing.zhuo@amd.com>
Signed-off-by: default avatarWenjing Liu <wenjing.liu@amd.com>
Tested-by: default avatarDaniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 1099238b

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c

+1 −1
Original line number Diff line number Diff line
@@ -2273,7 +2273,7 @@ static int dm_late_init(void *handle) 
		struct dc_link *edp_links[MAX_NUM_EDP];

		int edp_num;



		get_edp_links(adev->dm.dc, edp_links, &edp_num);

		dc_get_edp_links(adev->dm.dc, edp_links, &edp_num);

		for (i = 0; i < edp_num; i++) {

			if (!dmub_init_abm_config(adev->dm.dc->res_pool, params, i))

				return -EINVAL;

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c

+1 −1
Original line number Diff line number Diff line
@@ -724,7 +724,7 @@ static ssize_t dp_phy_test_pattern_debugfs_write(struct file *f, const char __us 
	for (i = 0; i < (unsigned int)(link_training_settings.link_settings.lane_count); i++)

		link_training_settings.hw_lane_settings[i] = link->cur_lane_setting[i];



	dc_link_set_test_pattern(

	dc_link_dp_set_test_pattern(

		link,

		test_pattern,

		DP_TEST_PATTERN_COLOR_SPACE_RGB,

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

+2 −2
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ void clk_mgr_exit_optimized_pwr_state(const struct dc *dc, struct clk_mgr *clk_m 
	int edp_num;

	unsigned int panel_inst;



	get_edp_links(dc, edp_links, &edp_num);

	dc_get_edp_links(dc, edp_links, &edp_num);

	if (dc->hwss.exit_optimized_pwr_state)

		dc->hwss.exit_optimized_pwr_state(dc, dc->current_state);
@@ -129,7 +129,7 @@ void clk_mgr_optimize_pwr_state(const struct dc *dc, struct clk_mgr *clk_mgr) 
	int edp_num;

	unsigned int panel_inst;



	get_edp_links(dc, edp_links, &edp_num);

	dc_get_edp_links(dc, edp_links, &edp_num);

	if (edp_num) {

		for (panel_inst = 0; panel_inst < edp_num; panel_inst++) {

			edp_link = edp_links[panel_inst];

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

+2 −154
Original line number Diff line number Diff line
@@ -53,7 +53,6 @@ 
#include "link_encoder.h"

#include "link_enc_cfg.h"



#include "dc_link.h"

#include "link.h"

#include "dm_helpers.h"

#include "mem_input.h"
@@ -1298,7 +1297,7 @@ static void detect_edp_presence(struct dc *dc) 
	int i;

	int edp_num;



	get_edp_links(dc, edp_links, &edp_num);

	dc_get_edp_links(dc, edp_links, &edp_num);

	if (!edp_num)

		return;
@@ -4317,157 +4316,6 @@ bool dc_is_dmcu_initialized(struct dc *dc) 
	return false;

}



bool dc_is_oem_i2c_device_present(

	struct dc *dc,

	size_t slave_address)

{

	if (dc->res_pool->oem_device)

		return dce_i2c_oem_device_present(

			dc->res_pool,

			dc->res_pool->oem_device,

			slave_address);



	return false;

}



bool dc_submit_i2c(

		struct dc *dc,

		uint32_t link_index,

		struct i2c_command *cmd)

{



	struct dc_link *link = dc->links[link_index];

	struct ddc_service *ddc = link->ddc;

	return dce_i2c_submit_command(

		dc->res_pool,

		ddc->ddc_pin,

		cmd);

}



bool dc_submit_i2c_oem(

		struct dc *dc,

		struct i2c_command *cmd)

{

	struct ddc_service *ddc = dc->res_pool->oem_device;

	if (ddc)

		return dce_i2c_submit_command(

			dc->res_pool,

			ddc->ddc_pin,

			cmd);



	return false;

}



static bool link_add_remote_sink_helper(struct dc_link *dc_link, struct dc_sink *sink)

{

	if (dc_link->sink_count >= MAX_SINKS_PER_LINK) {

		BREAK_TO_DEBUGGER();

		return false;

	}



	dc_sink_retain(sink);



	dc_link->remote_sinks[dc_link->sink_count] = sink;

	dc_link->sink_count++;



	return true;

}



/*

 * dc_link_add_remote_sink() - Create a sink and attach it to an existing link

 *

 * EDID length is in bytes

 */

struct dc_sink *dc_link_add_remote_sink(

		struct dc_link *link,

		const uint8_t *edid,

		int len,

		struct dc_sink_init_data *init_data)

{

	struct dc_sink *dc_sink;

	enum dc_edid_status edid_status;



	if (len > DC_MAX_EDID_BUFFER_SIZE) {

		dm_error("Max EDID buffer size breached!\n");

		return NULL;

	}



	if (!init_data) {

		BREAK_TO_DEBUGGER();

		return NULL;

	}



	if (!init_data->link) {

		BREAK_TO_DEBUGGER();

		return NULL;

	}



	dc_sink = dc_sink_create(init_data);



	if (!dc_sink)

		return NULL;



	memmove(dc_sink->dc_edid.raw_edid, edid, len);

	dc_sink->dc_edid.length = len;



	if (!link_add_remote_sink_helper(

			link,

			dc_sink))

		goto fail_add_sink;



	edid_status = dm_helpers_parse_edid_caps(

			link,

			&dc_sink->dc_edid,

			&dc_sink->edid_caps);



	/*

	 * Treat device as no EDID device if EDID

	 * parsing fails

	 */

	if (edid_status != EDID_OK && edid_status != EDID_PARTIAL_VALID) {

		dc_sink->dc_edid.length = 0;

		dm_error("Bad EDID, status%d!\n", edid_status);

	}



	return dc_sink;



fail_add_sink:

	dc_sink_release(dc_sink);

	return NULL;

}



/*

 * dc_link_remove_remote_sink() - Remove a remote sink from a dc_link

 *

 * Note that this just removes the struct dc_sink - it doesn't

 * program hardware or alter other members of dc_link

 */

void dc_link_remove_remote_sink(struct dc_link *link, struct dc_sink *sink)

{

	int i;



	if (!link->sink_count) {

		BREAK_TO_DEBUGGER();

		return;

	}



	for (i = 0; i < link->sink_count; i++) {

		if (link->remote_sinks[i] == sink) {

			dc_sink_release(sink);

			link->remote_sinks[i] = NULL;



			/* shrink array to remove empty place */

			while (i < link->sink_count - 1) {

				link->remote_sinks[i] = link->remote_sinks[i+1];

				i++;

			}

			link->remote_sinks[i] = NULL;

			link->sink_count--;

			return;

		}

	}

}



void get_clock_requirements_for_state(struct dc_state *state, struct AsicStateEx *info)

{

	info->displayClock				= (unsigned int)state->bw_ctx.bw.dcn.clk.dispclk_khz;
@@ -4990,7 +4838,7 @@ void dc_notify_vsync_int_state(struct dc *dc, struct dc_stream_state *stream, bo 
		return;

	}



	get_edp_links(dc, edp_links, &edp_num);

	dc_get_edp_links(dc, edp_links, &edp_num);



	/* Determine panel inst */

	for (i = 0; i < edp_num; i++) {

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

+87 −0
Original line number Diff line number Diff line
@@ -34,6 +34,49 @@ 
 * in this file which calls link functions.

 */

#include "link.h"

#include "dce/dce_i2c.h"

struct dc_link *dc_get_link_at_index(struct dc *dc, uint32_t link_index)

{

	return dc->links[link_index];

}



void dc_get_edp_links(const struct dc *dc,

		struct dc_link **edp_links,

		int *edp_num)

{

	int i;



	*edp_num = 0;

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

		// report any eDP links, even unconnected DDI's

		if (!dc->links[i])

			continue;

		if (dc->links[i]->connector_signal == SIGNAL_TYPE_EDP) {

			edp_links[*edp_num] = dc->links[i];

			if (++(*edp_num) == MAX_NUM_EDP)

				return;

		}

	}

}



bool dc_get_edp_link_panel_inst(const struct dc *dc,

		const struct dc_link *link,

		unsigned int *inst_out)

{

	struct dc_link *edp_links[MAX_NUM_EDP];

	int edp_num, i;



	*inst_out = 0;

	if (link->connector_signal != SIGNAL_TYPE_EDP)

		return false;

	dc_get_edp_links(dc, edp_links, &edp_num);

	for (i = 0; i < edp_num; i++) {

		if (link == edp_links[i])

			break;

		(*inst_out)++;

	}

	return true;

}



bool dc_link_detect(struct dc_link *link, enum dc_detect_reason reason)

{
@@ -101,3 +144,47 @@ bool dc_link_update_dsc_config(struct pipe_ctx *pipe_ctx) 
{

	return link_update_dsc_config(pipe_ctx);

}



bool dc_is_oem_i2c_device_present(

	struct dc *dc,

	size_t slave_address)

{

	if (dc->res_pool->oem_device)

		return dce_i2c_oem_device_present(

			dc->res_pool,

			dc->res_pool->oem_device,

			slave_address);



	return false;

}



bool dc_submit_i2c(

		struct dc *dc,

		uint32_t link_index,

		struct i2c_command *cmd)

{



	struct dc_link *link = dc->links[link_index];

	struct ddc_service *ddc = link->ddc;



	return dce_i2c_submit_command(

		dc->res_pool,

		ddc->ddc_pin,

		cmd);

}



bool dc_submit_i2c_oem(

		struct dc *dc,

		struct i2c_command *cmd)

{

	struct ddc_service *ddc = dc->res_pool->oem_device;



	if (ddc)

		return dce_i2c_submit_command(

			dc->res_pool,

			ddc->ddc_pin,

			cmd);



	return false;

}