Skip to content

Commit

Permalink
Revert "drm/amd/display: Block UHBR Based On USB-C PD Cable ID"
Browse files Browse the repository at this point in the history
This reverts commit 4f01a68.

[why & how]
The offending commit caused a lighting issue for Samsung Odyssey G9
monitors when connecting via USB-C. The commit was intended to block certain UHBR rates.

Reviewed-by: Charlene Liu <charlene.liu@amd.com>
Signed-off-by: Ausef Yousof <Ausef.Yousof@amd.com>
Signed-off-by: Zaeem Mohamed <zaeem.mohamed@amd.com>
Tested-by: Daniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
  • Loading branch information
Ausef Yousof authored and Alex Deucher committed Nov 4, 2024
1 parent d1fd30e commit d7b86a0
Showing 1 changed file with 6 additions and 16 deletions.
22 changes: 6 additions & 16 deletions drivers/gpu/drm/amd/display/dc/link/protocols/link_dp_capability.c
Original file line number Diff line number Diff line change
Expand Up @@ -1417,8 +1417,7 @@ static bool get_usbc_cable_id(struct dc_link *link, union dp_cable_id *cable_id)

if (!link->ctx->dmub_srv ||
link->ep_type != DISPLAY_ENDPOINT_PHY ||
link->link_enc->features.flags.bits.DP_IS_USB_C == 0 ||
link->link_enc->features.flags.bits.IS_DP2_CAPABLE == 0)
link->link_enc->features.flags.bits.DP_IS_USB_C == 0)
return false;

memset(&cmd, 0, sizeof(cmd));
Expand All @@ -1431,9 +1430,7 @@ static bool get_usbc_cable_id(struct dc_link *link, union dp_cable_id *cable_id)
cable_id->raw = cmd.cable_id.data.output_raw;
DC_LOG_DC("usbc_cable_id = %d.\n", cable_id->raw);
}

ASSERT(cmd.cable_id.header.ret_status);
return true;
return cmd.cable_id.header.ret_status == 1;
}

static void retrieve_cable_id(struct dc_link *link)
Expand Down Expand Up @@ -2130,8 +2127,6 @@ struct dc_link_settings dp_get_max_link_cap(struct dc_link *link)
/* get max link encoder capability */
if (link_enc)
link_enc->funcs->get_max_link_cap(link_enc, &max_link_cap);
else
return max_link_cap;

/* Lower link settings based on sink's link cap */
if (link->reported_link_cap.lane_count < max_link_cap.lane_count)
Expand Down Expand Up @@ -2165,15 +2160,10 @@ struct dc_link_settings dp_get_max_link_cap(struct dc_link *link)
*/
cable_max_link_rate = get_cable_max_link_rate(link);

if (!link->dc->debug.ignore_cable_id) {
if (cable_max_link_rate != LINK_RATE_UNKNOWN)
// cable max link rate known
max_link_cap.link_rate = MIN(max_link_cap.link_rate, cable_max_link_rate);
else if (link_enc->funcs->is_in_alt_mode && link_enc->funcs->is_in_alt_mode(link_enc))
// cable max link rate ambiguous, DP alt mode, limit to HBR3
max_link_cap.link_rate = MIN(max_link_cap.link_rate, LINK_RATE_HIGH3);
//else {}
// cable max link rate ambiguous, DP, do nothing
if (!link->dc->debug.ignore_cable_id &&
cable_max_link_rate != LINK_RATE_UNKNOWN) {
if (cable_max_link_rate < max_link_cap.link_rate)
max_link_cap.link_rate = cable_max_link_rate;

if (!link->dpcd_caps.cable_id.bits.UHBR13_5_CAPABILITY &&
link->dpcd_caps.cable_id.bits.CABLE_TYPE >= 2)
Expand Down

0 comments on commit d7b86a0

Please sign in to comment.