Skip to content

Commit f031ba1

Browse files
George Shenalexdeucher
authored andcommitted
drm/amd/display: Update test link rate DPCD bit field to match spec
[Why] An SCR was made to the DP2.0 spec that updated the bit field definition for UHBR13.5 in the test link rate DPCD register. [How] Add new translation to match the SCR update. Keep old translation for backwards compatibility. Reviewed-by: Wenjing Liu <wenjing.liu@amd.com> Acked-by: Hersen Wu <hersenxs.wu@amd.com> Signed-off-by: George Shen <george.shen@amd.com> Tested-by: Daniel Wheeler <daniel.wheeler@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
1 parent 8df0d7d commit f031ba1

2 files changed

Lines changed: 9 additions & 2 deletions

File tree

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,8 @@ enum dp_test_link_rate {
142142
DP_TEST_LINK_RATE_HBR3 = 0x1E,
143143
DP_TEST_LINK_RATE_UHBR10 = 0x01,
144144
DP_TEST_LINK_RATE_UHBR20 = 0x02,
145-
DP_TEST_LINK_RATE_UHBR13_5 = 0x03,
145+
DP_TEST_LINK_RATE_UHBR13_5_LEGACY = 0x03, /* For backward compatibility*/
146+
DP_TEST_LINK_RATE_UHBR13_5 = 0x04,
146147
};
147148

148149
struct dc_link_settings {

drivers/gpu/drm/amd/display/dc/link/accessories/link_dp_cts.c

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ static enum dc_link_rate get_link_rate_from_test_link_rate(uint8_t test_rate)
5353
return LINK_RATE_UHBR10;
5454
case DP_TEST_LINK_RATE_UHBR20:
5555
return LINK_RATE_UHBR20;
56+
case DP_TEST_LINK_RATE_UHBR13_5_LEGACY:
5657
case DP_TEST_LINK_RATE_UHBR13_5:
5758
return LINK_RATE_UHBR13_5;
5859
default:
@@ -119,6 +120,11 @@ static void dp_test_send_link_training(struct dc_link *link)
119120
1);
120121
link_settings.link_rate = get_link_rate_from_test_link_rate(test_rate);
121122

123+
if (link_settings.link_rate == LINK_RATE_UNKNOWN) {
124+
DC_LOG_ERROR("%s: Invalid test link rate.", __func__);
125+
ASSERT(0);
126+
}
127+
122128
/* Set preferred link settings */
123129
link->verified_link_cap.lane_count = link_settings.lane_count;
124130
link->verified_link_cap.link_rate = link_settings.link_rate;
@@ -457,7 +463,7 @@ static void set_crtc_test_pattern(struct dc_link *link,
457463
controller_color_space = pipe_ctx->stream_res.test_pattern_params.color_space;
458464

459465
if (controller_color_space == CONTROLLER_DP_COLOR_SPACE_UDEFINED) {
460-
DC_LOG_WARNING("%s: Color space must be defined for test pattern", __func__);
466+
DC_LOG_ERROR("%s: Color space must be defined for test pattern", __func__);
461467
ASSERT(0);
462468
}
463469

0 commit comments

Comments
 (0)