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

Commit 9a54f87c authored by Ajay Singh Parmar's avatar Ajay Singh Parmar
Browse files

disp: msm: dp: update swing and pre-emp with new hardware settings 



Update the DP controller and PHY programming according to
the new hardware recommendations.

CRs-Fixed: 2458753
Change-Id: I1bce5915ba6ebbb250cc5c4aac907b0b287eece7
Signed-off-by: default avatarAjay Singh Parmar <aparmar@codeaurora.org>
parent c44165dd

msm/dp/dp_catalog.c

+1 −1
Original line number Diff line number Diff line
@@ -1530,7 +1530,7 @@ static void dp_catalog_ctrl_phy_lane_cfg(struct dp_catalog_ctrl *ctrl, 
}



static void dp_catalog_ctrl_update_vx_px(struct dp_catalog_ctrl *ctrl,

		u8 v_level, u8 p_level)

		u8 v_level, u8 p_level, bool high)

{

	struct dp_catalog_private *catalog;

	struct dp_io_data *io_data;

msm/dp/dp_catalog.h

+1 −1
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ struct dp_catalog_ctrl { 
	void (*phy_lane_cfg)(struct dp_catalog_ctrl *ctrl, bool flipped,

				u8 lane_cnt);

	void (*update_vx_px)(struct dp_catalog_ctrl *ctrl, u8 v_level,

				u8 p_level);

				u8 p_level, bool high);

	void (*get_interrupt)(struct dp_catalog_ctrl *ctrl);

	u32 (*read_hdcp_status)(struct dp_catalog_ctrl *ctrl);

	void (*send_phy_pattern)(struct dp_catalog_ctrl *ctrl,

msm/dp/dp_catalog_v420.c

+47 −5
Original line number Diff line number Diff line
@@ -32,6 +32,34 @@ static u8 const vm_voltage_swing[MAX_VOLTAGE_LEVELS][MAX_PRE_EMP_LEVELS] = { 
	{0xFF, 0xFF, 0xFF, 0xFF}  /* sw1, 1.2 v, optional */

};



static u8 const dp_pre_emp_hbr2_hbr3[MAX_VOLTAGE_LEVELS][MAX_PRE_EMP_LEVELS] = {

	{0x00, 0x0C, 0x15, 0x1A}, /* pe0, 0 db */

	{0x02, 0x0E, 0x16, 0xFF}, /* pe1, 3.5 db */

	{0x02, 0x11, 0xFF, 0xFF}, /* pe2, 6.0 db */

	{0x04, 0xFF, 0xFF, 0xFF}  /* pe3, 9.5 db */

};



static u8 const dp_swing_hbr2_hbr3[MAX_VOLTAGE_LEVELS][MAX_PRE_EMP_LEVELS] = {

	{0x02, 0x12, 0x16, 0x1A}, /* sw0, 0.4v  */

	{0x09, 0x19, 0x1F, 0xFF}, /* sw1, 0.6v */

	{0x10, 0x1F, 0xFF, 0xFF}, /* sw1, 0.8v */

	{0x1F, 0xFF, 0xFF, 0xFF}  /* sw1, 1.2v */

};



static u8 const dp_pre_emp_hbr_rbr[MAX_VOLTAGE_LEVELS][MAX_PRE_EMP_LEVELS] = {

	{0x00, 0x0E, 0x15, 0x1A}, /* pe0, 0 db */

	{0x00, 0x0E, 0x15, 0xFF}, /* pe1, 3.5 db */

	{0x00, 0x0E, 0xFF, 0xFF}, /* pe2, 6.0 db */

	{0x04, 0xFF, 0xFF, 0xFF}  /* pe3, 9.5 db */

};



static u8 const dp_swing_hbr_rbr[MAX_VOLTAGE_LEVELS][MAX_PRE_EMP_LEVELS] = {

	{0x08, 0x0F, 0x16, 0x1F}, /* sw0, 0.4v */

	{0x11, 0x1E, 0x1F, 0xFF}, /* sw1, 0.6v */

	{0x1A, 0x1F, 0xFF, 0xFF}, /* sw1, 0.8v */

	{0x1F, 0xFF, 0xFF, 0xFF}  /* sw1, 1.2v */

};



struct dp_catalog_io {

	struct dp_io_data *dp_ahb;

	struct dp_io_data *dp_aux;
@@ -212,11 +240,12 @@ static void dp_catalog_ctrl_phy_lane_cfg_v420(struct dp_catalog_ctrl *ctrl, 
}



static void dp_catalog_ctrl_update_vx_px_v420(struct dp_catalog_ctrl *ctrl,

		u8 v_level, u8 p_level)

		u8 v_level, u8 p_level, bool high)

{

	struct dp_catalog_private_v420 *catalog;

	struct dp_io_data *io_data;

	u8 value0, value1;

	u32 version;



	if (!ctrl || !((v_level < MAX_VOLTAGE_LEVELS)

		&& (p_level < MAX_PRE_EMP_LEVELS))) {
@@ -224,12 +253,25 @@ static void dp_catalog_ctrl_update_vx_px_v420(struct dp_catalog_ctrl *ctrl, 
		return;

	}



	pr_debug("hw: v=%d p=%d, high=%d\n", v_level, p_level, high);



	catalog = dp_catalog_get_priv_v420(ctrl);



	pr_debug("hw: v=%d p=%d\n", v_level, p_level);

	io_data = catalog->io->dp_ahb;

	version = dp_read(catalog->exe_mode, io_data, DP_HW_VERSION);



	if (version == 0x10020003) {

		if (high) {

			value0 = dp_swing_hbr2_hbr3[v_level][p_level];

			value1 = dp_pre_emp_hbr2_hbr3[v_level][p_level];

		} else {

			value0 = dp_swing_hbr_rbr[v_level][p_level];

			value1 = dp_pre_emp_hbr_rbr[v_level][p_level];

		}

	} else {

		value0 = vm_voltage_swing[v_level][p_level];

		value1 = vm_pre_emphasis[v_level][p_level];

	}



	/* program default setting first */

	io_data = catalog->io->dp_ln_tx0;

msm/dp/dp_ctrl.c

+11 −3
Original line number Diff line number Diff line
@@ -211,9 +211,14 @@ static int dp_ctrl_update_sink_vx_px(struct dp_ctrl_private *ctrl, 
static int dp_ctrl_update_vx_px(struct dp_ctrl_private *ctrl)

{

	struct dp_link *link = ctrl->link;

	bool high = false;



	if (ctrl->link->link_params.bw_code == DP_LINK_BW_5_4 ||

	    ctrl->link->link_params.bw_code == DP_LINK_BW_8_1)

		high = true;



	ctrl->catalog->update_vx_px(ctrl->catalog,

		link->phy_params.v_level, link->phy_params.p_level);

		link->phy_params.v_level, link->phy_params.p_level, high);



	return dp_ctrl_update_sink_vx_px(ctrl, link->phy_params.v_level,

		link->phy_params.p_level);
@@ -396,9 +401,12 @@ static int dp_ctrl_link_training_2(struct dp_ctrl_private *ctrl) 
		ret = -EINVAL;

		goto end;

	}



	if (pattern != DP_TRAINING_PATTERN_4)

		pattern |= DP_LINK_SCRAMBLING_DISABLE;



	ctrl->catalog->set_pattern(ctrl->catalog, pattern);

	ret = dp_ctrl_train_pattern_set(ctrl,

		pattern | DP_RECOVERED_CLOCK_OUT_EN);

	ret = dp_ctrl_train_pattern_set(ctrl, pattern);

	if (ret <= 0) {

		ret = -EINVAL;

		goto end;

msm/dp/dp_link.h

+8 −8
Original line number Diff line number Diff line
@@ -13,16 +13,16 @@ 
#define DP_LINK_ENUM_STR(x)		#x



enum dp_link_voltage_level {

	DP_LINK_VOLTAGE_LEVEL_0	= 0,

	DP_LINK_VOLTAGE_LEVEL_1	= 1,

	DP_LINK_VOLTAGE_LEVEL_2	= 2,

	DP_LINK_VOLTAGE_LEVEL_0,

	DP_LINK_VOLTAGE_LEVEL_1,

	DP_LINK_VOLTAGE_LEVEL_2,

	DP_LINK_VOLTAGE_MAX = DP_LINK_VOLTAGE_LEVEL_2,

};



enum dp_link_preemaphasis_level {

	DP_LINK_PRE_EMPHASIS_LEVEL_0	= 0,

	DP_LINK_PRE_EMPHASIS_LEVEL_1	= 1,

	DP_LINK_PRE_EMPHASIS_LEVEL_2	= 2,

	DP_LINK_PRE_EMPHASIS_LEVEL_0,

	DP_LINK_PRE_EMPHASIS_LEVEL_1,

	DP_LINK_PRE_EMPHASIS_LEVEL_2,

	DP_LINK_PRE_EMPHASIS_MAX = DP_LINK_PRE_EMPHASIS_LEVEL_2,

};