Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7783b9b8 authored by Tatenda Chipeperekwa's avatar Tatenda Chipeperekwa Committed by Aravind Venkateswaran
Browse files

drm/msm/dp: program mainlink levels before link training 



Program the mainlink levels before link training to ensure that
both the safe to exit levels and idle repetition parameters
are configured together with the link. This update is in line
with the current hardware programming guide and will ensure
better interoperability.

CRs-Fixed: 2351204
Change-Id: I9c1c4a3cf70888dbf48044201748736ab97733b7
Signed-off-by: default avatarTatenda Chipeperekwa <tatendac@codeaurora.org>
parent b5b38ff8

drivers/gpu/drm/msm/dp/dp_audio.c

+0 −27
Original line number Diff line number Diff line
@@ -346,32 +346,6 @@ static void dp_audio_setup_acr(struct dp_audio_private *audio) 
	catalog->config_acr(catalog);

}



static void dp_audio_safe_to_exit_level(struct dp_audio_private *audio)

{

	struct dp_catalog_audio *catalog = audio->catalog;

	u32 safe_to_exit_level = 0;



	switch (audio->dp_audio.lane_count) {

	case 1:

		safe_to_exit_level = 14;

		break;

	case 2:

		safe_to_exit_level = 8;

		break;

	case 4:

		safe_to_exit_level = 5;

		break;

	default:

		pr_debug("setting the default safe_to_exit_level = %u\n",

				safe_to_exit_level);

		safe_to_exit_level = 14;

		break;

	}



	catalog->data = safe_to_exit_level;

	catalog->safe_to_exit_level(catalog);

}



static void dp_audio_enable(struct dp_audio_private *audio, bool enable)

{

	struct dp_catalog_audio *catalog = audio->catalog;
@@ -432,7 +406,6 @@ static int dp_audio_info_setup(struct platform_device *pdev, 


	dp_audio_setup_sdp(audio);

	dp_audio_setup_acr(audio);

	dp_audio_safe_to_exit_level(audio);

	dp_audio_enable(audio, true);



	mutex_unlock(&audio->ops_lock);

drivers/gpu/drm/msm/dp/dp_catalog.c

+41 −26
Original line number Diff line number Diff line
@@ -727,8 +727,6 @@ static void dp_catalog_ctrl_config_ctrl(struct dp_catalog_ctrl *ctrl, u8 ln_cnt) 
	dp_write(catalog->exe_mode, io_data, DP_MAINLINK_CTRL, cfg);



	pr_debug("DP_MAINLINK_CTRL=0x%x\n", cfg);



	dp_write(catalog->exe_mode, io_data, DP_MAINLINK_LEVELS, 0xa08);

}



static void dp_catalog_panel_config_ctrl(struct dp_catalog_panel *panel,
@@ -1867,6 +1865,46 @@ static void dp_catalog_ctrl_update_rg(struct dp_catalog_ctrl *ctrl, u32 ch, 
	dp_write(catalog->exe_mode, io_data, DP_DP0_RG + reg_off, rg);

}



static void dp_catalog_ctrl_mainlink_levels(struct dp_catalog_ctrl *ctrl,

		u8 lane_cnt)

{

	struct dp_catalog_private *catalog;

	struct dp_io_data *io_data;

	u32 mainlink_levels, safe_to_exit_level = 14;



	catalog = dp_catalog_get_priv(ctrl);



	io_data   = catalog->io.dp_link;



	switch (lane_cnt) {

	case 1:

		safe_to_exit_level = 14;

		break;

	case 2:

		safe_to_exit_level = 8;

		break;

	case 4:

		safe_to_exit_level = 5;

		break;

	default:

		pr_debug("setting the default safe_to_exit_level = %u\n",

				safe_to_exit_level);

		break;

	}



	mainlink_levels = dp_read(catalog->exe_mode, io_data,

					DP_MAINLINK_LEVELS);

	mainlink_levels &= 0xFE0;

	mainlink_levels |= safe_to_exit_level;



	pr_debug("mainlink_level = 0x%x, safe_to_exit_level = 0x%x\n",

			mainlink_levels, safe_to_exit_level);



	dp_write(catalog->exe_mode, io_data, DP_MAINLINK_LEVELS,

			mainlink_levels);

}





/* panel related catalog functions */

static int dp_catalog_panel_timing_cfg(struct dp_catalog_panel *panel)

{
@@ -2070,29 +2108,6 @@ static void dp_catalog_audio_config_acr(struct dp_catalog_audio *audio) 
	dp_write(catalog->exe_mode, io_data, MMSS_DP_AUDIO_ACR_CTRL, acr_ctrl);

}



static void dp_catalog_audio_safe_to_exit_level(struct dp_catalog_audio *audio)

{

	struct dp_catalog_private *catalog;

	struct dp_io_data *io_data;

	u32 mainlink_levels, safe_to_exit_level;



	catalog = dp_catalog_get_priv(audio);



	io_data   = catalog->io.dp_link;

	safe_to_exit_level = audio->data;



	mainlink_levels = dp_read(catalog->exe_mode, io_data,

					DP_MAINLINK_LEVELS);

	mainlink_levels &= 0xFE0;

	mainlink_levels |= safe_to_exit_level;



	pr_debug("mainlink_level = 0x%x, safe_to_exit_level = 0x%x\n",

			mainlink_levels, safe_to_exit_level);



	dp_write(catalog->exe_mode, io_data, DP_MAINLINK_LEVELS,

			mainlink_levels);

}



static void dp_catalog_audio_enable(struct dp_catalog_audio *audio)

{

	struct dp_catalog_private *catalog;
@@ -2417,6 +2432,7 @@ struct dp_catalog *dp_catalog_get(struct device *dev, struct dp_parser *parser) 
		.update_rg = dp_catalog_ctrl_update_rg,

		.channel_dealloc = dp_catalog_ctrl_channel_dealloc,

		.fec_config = dp_catalog_ctrl_fec_config,

		.mainlink_levels = dp_catalog_ctrl_mainlink_levels,

	};

	struct dp_catalog_audio audio = {

		.init       = dp_catalog_audio_init,
@@ -2425,7 +2441,6 @@ struct dp_catalog *dp_catalog_get(struct device *dev, struct dp_parser *parser) 
		.config_sdp = dp_catalog_audio_config_sdp,

		.set_header = dp_catalog_audio_set_header,

		.get_header = dp_catalog_audio_get_header,

		.safe_to_exit_level = dp_catalog_audio_safe_to_exit_level,

	};

	struct dp_catalog_panel panel = {

		.timing_cfg = dp_catalog_panel_timing_cfg,

drivers/gpu/drm/msm/dp/dp_catalog.h

+1 −1
Original line number Diff line number Diff line
@@ -129,6 +129,7 @@ struct dp_catalog_ctrl { 
	void (*channel_dealloc)(struct dp_catalog_ctrl *ctrl,

			u32 ch, u32 ch_start_timeslot, u32 tot_ch_cnt);

	void (*fec_config)(struct dp_catalog_ctrl *ctrl, bool enable);

	void (*mainlink_levels)(struct dp_catalog_ctrl *ctrl, u8 lane_cnt);

};



#define HEADER_BYTE_2_BIT	 0
@@ -167,7 +168,6 @@ struct dp_catalog_audio { 
	void (*config_sdp)(struct dp_catalog_audio *audio);

	void (*set_header)(struct dp_catalog_audio *audio);

	void (*get_header)(struct dp_catalog_audio *audio);

	void (*safe_to_exit_level)(struct dp_catalog_audio *audio);

};



struct dp_dsc_cfg_data {

drivers/gpu/drm/msm/dp/dp_ctrl.c

+2 −0
Original line number Diff line number Diff line
@@ -173,6 +173,8 @@ static void dp_ctrl_configure_source_link_params(struct dp_ctrl_private *ctrl, 
		ctrl->catalog->mst_config(ctrl->catalog, ctrl->mst_mode);

		ctrl->catalog->config_ctrl(ctrl->catalog,

				ctrl->link->link_params.lane_count);

		ctrl->catalog->mainlink_levels(ctrl->catalog,

				ctrl->link->link_params.lane_count);

		ctrl->catalog->mainlink_ctrl(ctrl->catalog, true);

	} else {

		ctrl->catalog->mainlink_ctrl(ctrl->catalog, false);