Skip to content

Commit de84d58

Browse files
George Shenalexdeucher
authored andcommitted
drm/amd/display: Read LTTPR ALPM caps during link cap retrieval
[Why] The latest DP spec requires the DP TX to read DPCD F0000h through F0009h when detecting LTTPR capabilities for the first time. [How] Update LTTPR cap retrieval to read up to F0009h (two more bytes than the previous F0007h), and store the LTTPR ALPM capabilities. Reviewed-by: Wenjing Liu <[email protected]> Signed-off-by: George Shen <[email protected]> Signed-off-by: Roman Li <[email protected]> Tested-by: Daniel Wheeler <[email protected]> Signed-off-by: Alex Deucher <[email protected]>
1 parent 5f7e384 commit de84d58

File tree

2 files changed

+17
-1
lines changed

2 files changed

+17
-1
lines changed

drivers/gpu/drm/amd/display/dc/dc_dp_types.h

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -959,6 +959,14 @@ union dp_128b_132b_supported_lttpr_link_rates {
959959
uint8_t raw;
960960
};
961961

962+
union dp_alpm_lttpr_cap {
963+
struct {
964+
uint8_t AUX_LESS_ALPM_SUPPORTED :1;
965+
uint8_t RESERVED :7;
966+
} bits;
967+
uint8_t raw;
968+
};
969+
962970
union dp_sink_video_fallback_formats {
963971
struct {
964972
uint8_t dp_1024x768_60Hz_24bpp_support :1;
@@ -1118,6 +1126,7 @@ struct dc_lttpr_caps {
11181126
uint8_t max_ext_timeout;
11191127
union dp_main_link_channel_coding_lttpr_cap main_link_channel_coding;
11201128
union dp_128b_132b_supported_lttpr_link_rates supported_128b_132b_rates;
1129+
union dp_alpm_lttpr_cap alpm;
11211130
uint8_t aux_rd_interval[MAX_REPEATER_CNT - 1];
11221131
};
11231132

@@ -1370,6 +1379,9 @@ struct dp_trace {
13701379
#ifndef DPCD_MAX_UNCOMPRESSED_PIXEL_RATE_CAP
13711380
#define DPCD_MAX_UNCOMPRESSED_PIXEL_RATE_CAP 0x221c
13721381
#endif
1382+
#ifndef DP_LTTPR_ALPM_CAPABILITIES
1383+
#define DP_LTTPR_ALPM_CAPABILITIES 0xF0009
1384+
#endif
13731385
#ifndef DP_REPEATER_CONFIGURATION_AND_STATUS_SIZE
13741386
#define DP_REPEATER_CONFIGURATION_AND_STATUS_SIZE 0x50
13751387
#endif

drivers/gpu/drm/amd/display/dc/link/protocols/link_dp_capability.c

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1502,7 +1502,7 @@ static bool dpcd_read_sink_ext_caps(struct dc_link *link)
15021502

15031503
enum dc_status dp_retrieve_lttpr_cap(struct dc_link *link)
15041504
{
1505-
uint8_t lttpr_dpcd_data[8] = {0};
1505+
uint8_t lttpr_dpcd_data[10] = {0};
15061506
enum dc_status status;
15071507
bool is_lttpr_present;
15081508

@@ -1552,6 +1552,10 @@ enum dc_status dp_retrieve_lttpr_cap(struct dc_link *link)
15521552
lttpr_dpcd_data[DP_PHY_REPEATER_128B132B_RATES -
15531553
DP_LT_TUNABLE_PHY_REPEATER_FIELD_DATA_STRUCTURE_REV];
15541554

1555+
link->dpcd_caps.lttpr_caps.alpm.raw =
1556+
lttpr_dpcd_data[DP_LTTPR_ALPM_CAPABILITIES -
1557+
DP_LT_TUNABLE_PHY_REPEATER_FIELD_DATA_STRUCTURE_REV];
1558+
15551559
/* If this chip cap is set, at least one retimer must exist in the chain
15561560
* Override count to 1 if we receive a known bad count (0 or an invalid value) */
15571561
if (((link->chip_caps & AMD_EXT_DISPLAY_PATH_CAPS__EXT_CHIP_MASK) == AMD_EXT_DISPLAY_PATH_CAPS__DP_FIXED_VS_EN) &&

0 commit comments

Comments
 (0)