drivers/gpu/drm/amd/display/dc/link/protocols/link_frl_training.c: combined retry and rate fallback loop

Author: mkopec

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

@@ -243,16 +243,29 @@ bool dc_link_perform_frl_training(struct dc_link *link,
 bool dc_link_perform_frl_training_with_retries(struct dc_link *link,
 				  const struct link_resource *link_res)
 {
+	uint8_t min_rate;
 	bool success;
 	int i;
 
+	/* We will attempt the highest rate first, then fall back to a lower rate */
+	min_rate = link->cur_link_settings.frl_rate;
+	link->cur_link_settings.frl_rate = link->local_sink->edid_caps.frl_caps.max_rate;
+	link->cur_link_settings.lane_count = link->cur_link_settings.frl_rate <= 2 ? 3 : 4;
+
 	for (i = 0; i < FRL_TRAINING_RETRIES; ++i) {
 		success = dc_link_perform_frl_training(link, link_res);
 
 		if (success)
 			break;
 
-		DC_LOG_HW_LINK_TRAINING("FRL: Training attempt %d failed!");
+		if (link->cur_link_settings.frl_rate > min_rate) {
+			link->cur_link_settings.frl_rate--;
+			link->cur_link_settings.lane_count =
+				link->cur_link_settings.frl_rate <= 2 ? 3 : 4;
+		}
+
+		DC_LOG_HW_LINK_TRAINING("FRL: Training attempt %d failed! Will attempt rate %d next",
+			i, link->cur_link_settings.frl_rate);
 	}
 
 	return success;
@@ -567,7 +580,7 @@ bool hdmi_decide_link_settings(
 			pipe_ctx->link_config.dp_link_settings.frl_rate = frl_rate;
 			pipe_ctx->link_config.dp_link_settings.lane_count = cfg.lanes;
 
-			pr_info("HDMI FRL: Rate %d Supported. Borrowed: %d, Margin: %d ppm\n",
+			DC_LOG_HW_LINK_TRAINING("HDMI FRL: Rate %d Supported. Borrowed: %llu, Margin: %d ppm\n",
 					frl_rate, res.tb_borrowed, res.margin_ppm);
 			return true;
 		}