samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

disp: msm: dp: renaming DP_TEST_PHY_PATTERN

Browse Source 
Commit 4342f839ae7e ("drm/dp: get/set phy compliance pattern")
swaps TEST_PHY with PHY_TEST in drm_dp_helper header file. This
changes updates the relevant changes in the dp driver.

Change-Id: I5c24a100022277388af530c526f169a03c6df889
Signed-off-by: Samantha Tran <samtran@codeaurora.org>
Signed-off-by: Nilaan Gunabalachandran <ngunabal@codeaurora.org>
Signed-off-by: Rajkumar Subbiah <rsubbia@codeaurora.org>
This commit is contained in:
Samantha Tran
2020-09-17 10:02:25 -07:00
committed by Nilaan Gunabalachandran
parent 6fa94ff382
commit b5784e4724
4 changed files with 40 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
msm/dp/dp_catalog.c
View File

@@ -10,6 +10,7 @@
#include "dp_catalog.h" #include "dp_catalog.h"
#include "dp_reg.h" #include "dp_reg.h"
#include "dp_debug.h" #include "dp_debug.h"
#include "dp_link.h"
#define DP_GET_MSB(x) (x >> 8) #define DP_GET_MSB(x) (x >> 8)
#define DP_GET_LSB(x) (x & 0xff) #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); dp_write(DP_STATE_CTRL, 0x0);
switch (pattern) { switch (pattern) {
case DP_TEST_PHY_PATTERN_D10_2_NO_SCRAMBLING: case DP_PHY_TEST_PATTERN_D10_2:
dp_write(DP_STATE_CTRL, 0x1); dp_write(DP_STATE_CTRL, 0x1);
break; break;
case DP_TEST_PHY_PATTERN_SYMBOL_ERR_MEASUREMENT_CNT: case DP_PHY_TEST_PATTERN_ERROR_COUNT:
value &= ~(1 << 16); value &= ~(1 << 16);
dp_write(DP_HBR2_COMPLIANCE_SCRAMBLER_RESET, value); dp_write(DP_HBR2_COMPLIANCE_SCRAMBLER_RESET, value);
value |= 0xFC; 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_MAINLINK_LEVELS, 0x2);
dp_write(DP_STATE_CTRL, 0x10); dp_write(DP_STATE_CTRL, 0x10);
break; break;
case DP_TEST_PHY_PATTERN_PRBS7: case DP_PHY_TEST_PATTERN_PRBS7:
dp_write(DP_STATE_CTRL, 0x20); dp_write(DP_STATE_CTRL, 0x20);
break; break;
case DP_TEST_PHY_PATTERN_80_BIT_CUSTOM_PATTERN: case DP_PHY_TEST_PATTERN_80BIT_CUSTOM:
dp_write(DP_STATE_CTRL, 0x40); dp_write(DP_STATE_CTRL, 0x40);
/* 00111110000011111000001111100000 */ /* 00111110000011111000001111100000 */
dp_write(DP_TEST_80BIT_CUSTOM_PATTERN_REG0, 0x3E0F83E0); 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 */ /* 1111100000111110 */
dp_write(DP_TEST_80BIT_CUSTOM_PATTERN_REG2, 0x0000F83E); dp_write(DP_TEST_80BIT_CUSTOM_PATTERN_REG2, 0x0000F83E);
break; break;
case DP_TEST_PHY_PATTERN_CP2520_PATTERN_1: case DP_PHY_TEST_PATTERN_CP2520:
value = dp_read(DP_MAINLINK_CTRL); value = dp_read(DP_MAINLINK_CTRL);
value &= ~BIT(4); value &= ~BIT(4);
dp_write(DP_MAINLINK_CTRL, value); 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); value |= BIT(0);
dp_write(DP_MAINLINK_CTRL, value); dp_write(DP_MAINLINK_CTRL, value);
break; 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_MAINLINK_CTRL, 0x01);
dp_write(DP_STATE_CTRL, 0x8); dp_write(DP_STATE_CTRL, 0x8);
break; break;

17
msm/dp/dp_ctrl.c
View File

@@ -972,29 +972,24 @@ static void dp_ctrl_send_phy_test_pattern(struct dp_ctrl_private *ctrl)
switch (pattern_sent) { switch (pattern_sent) {
case MR_LINK_TRAINING1: case MR_LINK_TRAINING1:
if (pattern_requested == if (pattern_requested == DP_PHY_TEST_PATTERN_D10_2)
DP_TEST_PHY_PATTERN_D10_2_NO_SCRAMBLING)
success = true; success = true;
break; break;
case MR_LINK_SYMBOL_ERM: case MR_LINK_SYMBOL_ERM:
if ((pattern_requested == if ((pattern_requested == DP_PHY_TEST_PATTERN_ERROR_COUNT)
DP_TEST_PHY_PATTERN_SYMBOL_ERR_MEASUREMENT_CNT) || (pattern_requested == DP_PHY_TEST_PATTERN_CP2520))
|| (pattern_requested ==
DP_TEST_PHY_PATTERN_CP2520_PATTERN_1))
success = true; success = true;
break; break;
case MR_LINK_PRBS7: case MR_LINK_PRBS7:
if (pattern_requested == DP_TEST_PHY_PATTERN_PRBS7) if (pattern_requested == DP_PHY_TEST_PATTERN_PRBS7)
success = true; success = true;
break; break;
case MR_LINK_CUSTOM80: case MR_LINK_CUSTOM80:
if (pattern_requested == if (pattern_requested == DP_PHY_TEST_PATTERN_80BIT_CUSTOM)
DP_TEST_PHY_PATTERN_80_BIT_CUSTOM_PATTERN)
success = true; success = true;
break; break;
case MR_LINK_TRAINING4: case MR_LINK_TRAINING4:
if (pattern_requested == if (pattern_requested == DP_PHY_TEST_PATTERN_CP2520_3)
DP_TEST_PHY_PATTERN_CP2520_PATTERN_3)
success = true; success = true;
break; break;
default: default:

16
msm/dp/dp_link.c
View File

@@ -665,13 +665,13 @@ exit:
static bool dp_link_is_phy_test_pattern_supported(u32 phy_test_pattern_sel) static bool dp_link_is_phy_test_pattern_supported(u32 phy_test_pattern_sel)
{ {
switch (phy_test_pattern_sel) { switch (phy_test_pattern_sel) {
case DP_TEST_PHY_PATTERN_NONE: case DP_PHY_TEST_PATTERN_NONE:
case DP_TEST_PHY_PATTERN_D10_2_NO_SCRAMBLING: case DP_PHY_TEST_PATTERN_D10_2:
case DP_TEST_PHY_PATTERN_SYMBOL_ERR_MEASUREMENT_CNT: case DP_PHY_TEST_PATTERN_ERROR_COUNT:
case DP_TEST_PHY_PATTERN_PRBS7: case DP_PHY_TEST_PATTERN_PRBS7:
case DP_TEST_PHY_PATTERN_80_BIT_CUSTOM_PATTERN: case DP_PHY_TEST_PATTERN_80BIT_CUSTOM:
case DP_TEST_PHY_PATTERN_CP2520_PATTERN_1: case DP_PHY_TEST_PATTERN_CP2520:
case DP_TEST_PHY_PATTERN_CP2520_PATTERN_3: case DP_PHY_TEST_PATTERN_CP2520_3:
return true; return true;
default: default:
return false; 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 const param_len = 0x1;
int ret = 0; 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); &bp, param_len);
if (rlen < param_len) { if (rlen < param_len) {
DP_ERR("failed to read phy link pattern\n"); DP_ERR("failed to read phy link pattern\n");

35
msm/dp/dp_link.h
View File

@@ -12,6 +12,9 @@
#define DP_TEST_BIT_DEPTH_UNKNOWN 0xFFFFFFFF #define DP_TEST_BIT_DEPTH_UNKNOWN 0xFFFFFFFF
#define DP_LINK_ENUM_STR(x) #x #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 { enum dp_link_voltage_level {
DP_LINK_VOLTAGE_LEVEL_0, DP_LINK_VOLTAGE_LEVEL_0,
DP_LINK_VOLTAGE_LEVEL_1, 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) static inline char *dp_link_get_phy_test_pattern(u32 phy_test_pattern_sel)
{ {
switch (phy_test_pattern_sel) { switch (phy_test_pattern_sel) {
case DP_TEST_PHY_PATTERN_NONE: case DP_PHY_TEST_PATTERN_NONE:
return DP_LINK_ENUM_STR(DP_TEST_PHY_PATTERN_NONE); return DP_LINK_ENUM_STR(DP_PHY_TEST_PATTERN_NONE);
case DP_TEST_PHY_PATTERN_D10_2_NO_SCRAMBLING: case DP_PHY_TEST_PATTERN_D10_2:
return DP_LINK_ENUM_STR( return DP_LINK_ENUM_STR(
DP_TEST_PHY_PATTERN_D10_2_NO_SCRAMBLING); DP_PHY_TEST_PATTERN_D10_2);
case DP_TEST_PHY_PATTERN_SYMBOL_ERR_MEASUREMENT_CNT: case DP_PHY_TEST_PATTERN_ERROR_COUNT:
return DP_LINK_ENUM_STR( return DP_LINK_ENUM_STR(
DP_TEST_PHY_PATTERN_SYMBOL_ERR_MEASUREMENT_CNT); DP_PHY_TEST_PATTERN_ERROR_COUNT);
case DP_TEST_PHY_PATTERN_PRBS7: case DP_PHY_TEST_PATTERN_PRBS7:
return DP_LINK_ENUM_STR(DP_TEST_PHY_PATTERN_PRBS7); return DP_LINK_ENUM_STR(DP_PHY_TEST_PATTERN_PRBS7);
case DP_TEST_PHY_PATTERN_80_BIT_CUSTOM_PATTERN: case DP_PHY_TEST_PATTERN_80BIT_CUSTOM:
return DP_LINK_ENUM_STR( return DP_LINK_ENUM_STR(
DP_TEST_PHY_PATTERN_80_BIT_CUSTOM_PATTERN); DP_PHY_TEST_PATTERN_80BIT_CUSTOM);
case DP_TEST_PHY_PATTERN_CP2520_PATTERN_1: case DP_PHY_TEST_PATTERN_CP2520:
return DP_LINK_ENUM_STR(DP_TEST_PHY_PATTERN_CP2520_PATTERN_1); return DP_LINK_ENUM_STR(DP_PHY_TEST_PATTERN_CP2520);
case DP_TEST_PHY_PATTERN_CP2520_PATTERN_2: case DP_PHY_TEST_PATTERN_CP2520_2:
return DP_LINK_ENUM_STR(DP_TEST_PHY_PATTERN_CP2520_PATTERN_2); return DP_LINK_ENUM_STR(DP_PHY_TEST_PATTERN_CP2520_2);
case DP_TEST_PHY_PATTERN_CP2520_PATTERN_3: case DP_PHY_TEST_PATTERN_CP2520_3:
return DP_LINK_ENUM_STR(DP_TEST_PHY_PATTERN_CP2520_PATTERN_3); return DP_LINK_ENUM_STR(DP_PHY_TEST_PATTERN_CP2520_3);
default: default:
return "unknown"; return "unknown";
} }