drm/amd/display: support PHY compliance automation for CP2520 pattern 1/2/3

Signed-off-by: Tony Cheng <tony.cheng@amd.com>
Acked-by: Harry Wentland <Harry.Wentland@amd.com>
Reviewed-by: Tony Cheng <Tony.Cheng@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Tony Cheng 2017-03-14 19:16:36 -04:00 committed by Alex Deucher
parent 3f8a944016
commit 0e19401f95
4 changed files with 53 additions and 34 deletions

View File

@ -1609,8 +1609,14 @@ static void dp_test_send_phy_test_pattern(struct core_link *link)
case PHY_TEST_PATTERN_80BIT_CUSTOM:
test_pattern = DP_TEST_PATTERN_80BIT_CUSTOM;
break;
case PHY_TEST_PATTERN_HBR2_COMPLIANCE_EYE:
test_pattern = DP_TEST_PATTERN_HBR2_COMPLIANCE_EYE;
case PHY_TEST_PATTERN_CP2520_1:
test_pattern = DP_TEST_PATTERN_CP2520_1;
break;
case PHY_TEST_PATTERN_CP2520_2:
test_pattern = DP_TEST_PATTERN_CP2520_2;
break;
case PHY_TEST_PATTERN_CP2520_3:
test_pattern = DP_TEST_PATTERN_CP2520_3;
break;
default:
test_pattern = DP_TEST_PATTERN_VIDEO_MODE;
@ -2202,15 +2208,8 @@ void dc_link_dp_disable_hpd(const struct dc_link *link)
static bool is_dp_phy_pattern(enum dp_test_pattern test_pattern)
{
if (test_pattern == DP_TEST_PATTERN_D102 ||
test_pattern == DP_TEST_PATTERN_SYMBOL_ERROR ||
test_pattern == DP_TEST_PATTERN_PRBS7 ||
test_pattern == DP_TEST_PATTERN_80BIT_CUSTOM ||
test_pattern == DP_TEST_PATTERN_HBR2_COMPLIANCE_EYE ||
test_pattern == DP_TEST_PATTERN_TRAINING_PATTERN1 ||
test_pattern == DP_TEST_PATTERN_TRAINING_PATTERN2 ||
test_pattern == DP_TEST_PATTERN_TRAINING_PATTERN3 ||
test_pattern == DP_TEST_PATTERN_TRAINING_PATTERN4 ||
if ((DP_TEST_PATTERN_PHY_PATTERN_BEGIN <= test_pattern &&
test_pattern <= DP_TEST_PATTERN_PHY_PATTERN_END) ||
test_pattern == DP_TEST_PATTERN_VIDEO_MODE)
return true;
else
@ -2390,8 +2389,14 @@ bool dc_link_dp_set_test_pattern(
case DP_TEST_PATTERN_80BIT_CUSTOM:
pattern = PHY_TEST_PATTERN_80BIT_CUSTOM;
break;
case DP_TEST_PATTERN_HBR2_COMPLIANCE_EYE:
pattern = PHY_TEST_PATTERN_HBR2_COMPLIANCE_EYE;
case DP_TEST_PATTERN_CP2520_1:
pattern = PHY_TEST_PATTERN_CP2520_1;
break;
case DP_TEST_PATTERN_CP2520_2:
pattern = PHY_TEST_PATTERN_CP2520_2;
break;
case DP_TEST_PATTERN_CP2520_3:
pattern = PHY_TEST_PATTERN_CP2520_3;
break;
default:
return false;

View File

@ -376,7 +376,8 @@ static void set_dp_phy_pattern_80bit_custom(
}
static void set_dp_phy_pattern_hbr2_compliance_cp2520_2(
struct dce110_link_encoder *enc110)
struct dce110_link_encoder *enc110,
unsigned int cp2520_pattern)
{
/* previously there is a register DP_HBR2_EYE_PATTERN
@ -408,10 +409,13 @@ static void set_dp_phy_pattern_hbr2_compliance_cp2520_2(
/* swap every BS with SR */
REG_UPDATE(DP_DPHY_SCRAM_CNTL, DPHY_SCRAMBLER_BS_COUNT, 0);
/* select cp2520 pattern 2 */
/* select cp2520 patterns */
if (REG(DP_DPHY_HBR2_PATTERN_CONTROL))
REG_UPDATE(DP_DPHY_HBR2_PATTERN_CONTROL,
DP_DPHY_HBR2_PATTERN_CONTROL, 0x2);
DP_DPHY_HBR2_PATTERN_CONTROL, cp2520_pattern);
else
/* pre-DCE11 can only generate CP2520 pattern 2 */
ASSERT(cp2520_pattern == 2);
/* set link training complete */
set_link_training_complete(enc110, true);
@ -1395,8 +1399,11 @@ void dce110_link_encoder_dp_set_phy_pattern(
set_dp_phy_pattern_80bit_custom(
enc110, param->custom_pattern);
break;
case DP_TEST_PATTERN_HBR2_COMPLIANCE_EYE:
set_dp_phy_pattern_hbr2_compliance_cp2520_2(enc110);
case DP_TEST_PATTERN_CP2520_1:
set_dp_phy_pattern_hbr2_compliance_cp2520_2(enc110, 1);
break;
case DP_TEST_PATTERN_CP2520_2:
set_dp_phy_pattern_hbr2_compliance_cp2520_2(enc110, 2);
break;
case DP_TEST_PATTERN_VIDEO_MODE: {
set_dp_phy_pattern_passthrough_mode(

View File

@ -74,7 +74,9 @@ enum dpcd_phy_test_patterns {
PHY_TEST_PATTERN_SYMBOL_ERROR,
PHY_TEST_PATTERN_PRBS7,
PHY_TEST_PATTERN_80BIT_CUSTOM,/* For DP1.2 only */
PHY_TEST_PATTERN_HBR2_COMPLIANCE_EYE/* For DP1.2 only */
PHY_TEST_PATTERN_CP2520_1,
PHY_TEST_PATTERN_CP2520_2,
PHY_TEST_PATTERN_CP2520_3, /* same as TPS4 */
};
enum dpcd_test_dyn_range {

View File

@ -75,19 +75,24 @@ enum dp_test_pattern {
/* Input data is pass through Scrambler
* and 8b10b Encoder straight to output*/
DP_TEST_PATTERN_VIDEO_MODE = 0,
/* phy test patterns*/
DP_TEST_PATTERN_D102,
DP_TEST_PATTERN_PHY_PATTERN_BEGIN,
DP_TEST_PATTERN_D102 = DP_TEST_PATTERN_PHY_PATTERN_BEGIN,
DP_TEST_PATTERN_SYMBOL_ERROR,
DP_TEST_PATTERN_PRBS7,
DP_TEST_PATTERN_80BIT_CUSTOM,
DP_TEST_PATTERN_HBR2_COMPLIANCE_EYE,
DP_TEST_PATTERN_CP2520_1,
DP_TEST_PATTERN_CP2520_2,
DP_TEST_PATTERN_HBR2_COMPLIANCE_EYE = DP_TEST_PATTERN_CP2520_2,
/* Link Training Patterns */
DP_TEST_PATTERN_TRAINING_PATTERN1,
DP_TEST_PATTERN_TRAINING_PATTERN2,
DP_TEST_PATTERN_TRAINING_PATTERN3,
DP_TEST_PATTERN_TRAINING_PATTERN4,
DP_TEST_PATTERN_CP2520_3 = DP_TEST_PATTERN_TRAINING_PATTERN4,
DP_TEST_PATTERN_PHY_PATTERN_END = DP_TEST_PATTERN_TRAINING_PATTERN4,
/* link test patterns*/
DP_TEST_PATTERN_COLOR_SQUARES,