diff --git a/msm/dp/dp_catalog.c b/msm/dp/dp_catalog.c
index b3b7c59f02..37b68a7e88 100644
--- a/msm/dp/dp_catalog.c
+++ b/msm/dp/dp_catalog.c
@@ -10,6 +10,7 @@
 #include "dp_catalog.h"
 #include "dp_reg.h"
 #include "dp_debug.h"
+#include "dp_link.h"
 
 #define DP_GET_MSB(x)	(x >> 8)
 #define DP_GET_LSB(x)	(x & 0xff)
@@ -1835,10 +1836,10 @@ static void dp_catalog_ctrl_send_phy_pattern(struct dp_catalog_ctrl *ctrl,
 	dp_write(DP_STATE_CTRL, 0x0);
 
 	switch (pattern) {
-	case DP_TEST_PHY_PATTERN_D10_2_NO_SCRAMBLING:
+	case DP_PHY_TEST_PATTERN_D10_2:
 		dp_write(DP_STATE_CTRL, 0x1);
 		break;
-	case DP_TEST_PHY_PATTERN_SYMBOL_ERR_MEASUREMENT_CNT:
+	case DP_PHY_TEST_PATTERN_ERROR_COUNT:
 		value &= ~(1 << 16);
 		dp_write(DP_HBR2_COMPLIANCE_SCRAMBLER_RESET, value);
 		value |= 0xFC;
@@ -1846,10 +1847,10 @@ static void dp_catalog_ctrl_send_phy_pattern(struct dp_catalog_ctrl *ctrl,
 		dp_write(DP_MAINLINK_LEVELS, 0x2);
 		dp_write(DP_STATE_CTRL, 0x10);
 		break;
-	case DP_TEST_PHY_PATTERN_PRBS7:
+	case DP_PHY_TEST_PATTERN_PRBS7:
 		dp_write(DP_STATE_CTRL, 0x20);
 		break;
-	case DP_TEST_PHY_PATTERN_80_BIT_CUSTOM_PATTERN:
+	case DP_PHY_TEST_PATTERN_80BIT_CUSTOM:
 		dp_write(DP_STATE_CTRL, 0x40);
 		/* 00111110000011111000001111100000 */
 		dp_write(DP_TEST_80BIT_CUSTOM_PATTERN_REG0, 0x3E0F83E0);
@@ -1858,7 +1859,7 @@ static void dp_catalog_ctrl_send_phy_pattern(struct dp_catalog_ctrl *ctrl,
 		/* 1111100000111110 */
 		dp_write(DP_TEST_80BIT_CUSTOM_PATTERN_REG2, 0x0000F83E);
 		break;
-	case DP_TEST_PHY_PATTERN_CP2520_PATTERN_1:
+	case DP_PHY_TEST_PATTERN_CP2520:
 		value = dp_read(DP_MAINLINK_CTRL);
 		value &= ~BIT(4);
 		dp_write(DP_MAINLINK_CTRL, value);
@@ -1874,7 +1875,7 @@ static void dp_catalog_ctrl_send_phy_pattern(struct dp_catalog_ctrl *ctrl,
 		value |= BIT(0);
 		dp_write(DP_MAINLINK_CTRL, value);
 		break;
-	case DP_TEST_PHY_PATTERN_CP2520_PATTERN_3:
+	case DP_PHY_TEST_PATTERN_CP2520_3:
 		dp_write(DP_MAINLINK_CTRL, 0x01);
 		dp_write(DP_STATE_CTRL, 0x8);
 		break;
diff --git a/msm/dp/dp_ctrl.c b/msm/dp/dp_ctrl.c
index ad08e90197..d4d00e4481 100644
--- a/msm/dp/dp_ctrl.c
+++ b/msm/dp/dp_ctrl.c
@@ -972,29 +972,24 @@ static void dp_ctrl_send_phy_test_pattern(struct dp_ctrl_private *ctrl)
 
 	switch (pattern_sent) {
 	case MR_LINK_TRAINING1:
-		if (pattern_requested ==
-				DP_TEST_PHY_PATTERN_D10_2_NO_SCRAMBLING)
+		if (pattern_requested == DP_PHY_TEST_PATTERN_D10_2)
 			success = true;
 		break;
 	case MR_LINK_SYMBOL_ERM:
-		if ((pattern_requested ==
-				DP_TEST_PHY_PATTERN_SYMBOL_ERR_MEASUREMENT_CNT)
-			|| (pattern_requested ==
-				DP_TEST_PHY_PATTERN_CP2520_PATTERN_1))
+		if ((pattern_requested == DP_PHY_TEST_PATTERN_ERROR_COUNT)
+			|| (pattern_requested == DP_PHY_TEST_PATTERN_CP2520))
 			success = true;
 		break;
 	case MR_LINK_PRBS7:
-		if (pattern_requested == DP_TEST_PHY_PATTERN_PRBS7)
+		if (pattern_requested == DP_PHY_TEST_PATTERN_PRBS7)
 			success = true;
 		break;
 	case MR_LINK_CUSTOM80:
-		if (pattern_requested ==
-				DP_TEST_PHY_PATTERN_80_BIT_CUSTOM_PATTERN)
+		if (pattern_requested == DP_PHY_TEST_PATTERN_80BIT_CUSTOM)
 			success = true;
 		break;
 	case MR_LINK_TRAINING4:
-		if (pattern_requested ==
-				DP_TEST_PHY_PATTERN_CP2520_PATTERN_3)
+		if (pattern_requested == DP_PHY_TEST_PATTERN_CP2520_3)
 			success = true;
 		break;
 	default:
diff --git a/msm/dp/dp_link.c b/msm/dp/dp_link.c
index 57122e3431..31f60f79b4 100644
--- a/msm/dp/dp_link.c
+++ b/msm/dp/dp_link.c
@@ -665,13 +665,13 @@ exit:
 static bool dp_link_is_phy_test_pattern_supported(u32 phy_test_pattern_sel)
 {
 	switch (phy_test_pattern_sel) {
-	case DP_TEST_PHY_PATTERN_NONE:
-	case DP_TEST_PHY_PATTERN_D10_2_NO_SCRAMBLING:
-	case DP_TEST_PHY_PATTERN_SYMBOL_ERR_MEASUREMENT_CNT:
-	case DP_TEST_PHY_PATTERN_PRBS7:
-	case DP_TEST_PHY_PATTERN_80_BIT_CUSTOM_PATTERN:
-	case DP_TEST_PHY_PATTERN_CP2520_PATTERN_1:
-	case DP_TEST_PHY_PATTERN_CP2520_PATTERN_3:
+	case DP_PHY_TEST_PATTERN_NONE:
+	case DP_PHY_TEST_PATTERN_D10_2:
+	case DP_PHY_TEST_PATTERN_ERROR_COUNT:
+	case DP_PHY_TEST_PATTERN_PRBS7:
+	case DP_PHY_TEST_PATTERN_80BIT_CUSTOM:
+	case DP_PHY_TEST_PATTERN_CP2520:
+	case DP_PHY_TEST_PATTERN_CP2520_3:
 		return true;
 	default:
 		return false;
@@ -693,7 +693,7 @@ static int dp_link_parse_phy_test_params(struct dp_link_private *link)
 	int const param_len = 0x1;
 	int ret = 0;
 
-	rlen = drm_dp_dpcd_read(link->aux->drm_aux, DP_TEST_PHY_PATTERN,
+	rlen = drm_dp_dpcd_read(link->aux->drm_aux, DP_PHY_TEST_PATTERN,
 			&bp, param_len);
 	if (rlen < param_len) {
 		DP_ERR("failed to read phy link pattern\n");
diff --git a/msm/dp/dp_link.h b/msm/dp/dp_link.h
index db3456d973..05ba305777 100644
--- a/msm/dp/dp_link.h
+++ b/msm/dp/dp_link.h
@@ -12,6 +12,9 @@
 #define DP_TEST_BIT_DEPTH_UNKNOWN 0xFFFFFFFF
 #define DP_LINK_ENUM_STR(x)		#x
 
+#define DP_PHY_TEST_PATTERN_CP2520_2	0x6
+#define DP_PHY_TEST_PATTERN_CP2520_3	0x7
+
 enum dp_link_voltage_level {
 	DP_LINK_VOLTAGE_LEVEL_0,
 	DP_LINK_VOLTAGE_LEVEL_1,
@@ -127,25 +130,25 @@ struct dp_link {
 static inline char *dp_link_get_phy_test_pattern(u32 phy_test_pattern_sel)
 {
 	switch (phy_test_pattern_sel) {
-	case DP_TEST_PHY_PATTERN_NONE:
-		return DP_LINK_ENUM_STR(DP_TEST_PHY_PATTERN_NONE);
-	case DP_TEST_PHY_PATTERN_D10_2_NO_SCRAMBLING:
+	case DP_PHY_TEST_PATTERN_NONE:
+		return DP_LINK_ENUM_STR(DP_PHY_TEST_PATTERN_NONE);
+	case DP_PHY_TEST_PATTERN_D10_2:
 		return DP_LINK_ENUM_STR(
-			DP_TEST_PHY_PATTERN_D10_2_NO_SCRAMBLING);
-	case DP_TEST_PHY_PATTERN_SYMBOL_ERR_MEASUREMENT_CNT:
+			DP_PHY_TEST_PATTERN_D10_2);
+	case DP_PHY_TEST_PATTERN_ERROR_COUNT:
 		return DP_LINK_ENUM_STR(
-			DP_TEST_PHY_PATTERN_SYMBOL_ERR_MEASUREMENT_CNT);
-	case DP_TEST_PHY_PATTERN_PRBS7:
-		return DP_LINK_ENUM_STR(DP_TEST_PHY_PATTERN_PRBS7);
-	case DP_TEST_PHY_PATTERN_80_BIT_CUSTOM_PATTERN:
+			DP_PHY_TEST_PATTERN_ERROR_COUNT);
+	case DP_PHY_TEST_PATTERN_PRBS7:
+		return DP_LINK_ENUM_STR(DP_PHY_TEST_PATTERN_PRBS7);
+	case DP_PHY_TEST_PATTERN_80BIT_CUSTOM:
 		return DP_LINK_ENUM_STR(
-			DP_TEST_PHY_PATTERN_80_BIT_CUSTOM_PATTERN);
-	case DP_TEST_PHY_PATTERN_CP2520_PATTERN_1:
-		return DP_LINK_ENUM_STR(DP_TEST_PHY_PATTERN_CP2520_PATTERN_1);
-	case DP_TEST_PHY_PATTERN_CP2520_PATTERN_2:
-		return DP_LINK_ENUM_STR(DP_TEST_PHY_PATTERN_CP2520_PATTERN_2);
-	case DP_TEST_PHY_PATTERN_CP2520_PATTERN_3:
-		return DP_LINK_ENUM_STR(DP_TEST_PHY_PATTERN_CP2520_PATTERN_3);
+			DP_PHY_TEST_PATTERN_80BIT_CUSTOM);
+	case DP_PHY_TEST_PATTERN_CP2520:
+		return DP_LINK_ENUM_STR(DP_PHY_TEST_PATTERN_CP2520);
+	case DP_PHY_TEST_PATTERN_CP2520_2:
+		return DP_LINK_ENUM_STR(DP_PHY_TEST_PATTERN_CP2520_2);
+	case DP_PHY_TEST_PATTERN_CP2520_3:
+		return DP_LINK_ENUM_STR(DP_PHY_TEST_PATTERN_CP2520_3);
 	default:
 		return "unknown";
 	}