Commit d715c9a2 authored by Martin Tsai's avatar Martin Tsai Committed by Alex Deucher
Browse files

drm/amd/display: add protection in link encoder matching logic 



[Why]
Link encoders are created based on its engine ID. The position of a link
encoder in an array could be null since it didn't be allocated.  Current
matching logic didn't consider this situation and could get null
encoder.

[How]
To add null encoder check to make the matching logic can go to next to
get a valid one.

Tested-by: default avatarDaniel Wheeler <daniel.wheeler@amd.com>
Reviewed-by: default avatarAric Cyr <Aric.Cyr@amd.com>
Acked-by: default avatarRodrigo Siqueira <Rodrigo.Siqueira@amd.com>
Signed-off-by: default avatarMartin Tsai <martin.tsai@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 09ece5ac

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c

+1 −1
Original line number Diff line number Diff line
@@ -8366,7 +8366,7 @@ void amdgpu_dm_connector_init_helper(struct amdgpu_display_manager *dm, 
		break;

	case DRM_MODE_CONNECTOR_DisplayPort:

		aconnector->base.polled = DRM_CONNECTOR_POLL_HPD;

		link->link_enc = dp_get_link_enc(link);

		link->link_enc = link_enc_cfg_get_link_enc(link);

		ASSERT(link->link_enc);

		if (link->link_enc)

			aconnector->base.ycbcr_420_allowed =

drivers/gpu/drm/amd/display/dc/core/dc_link.c

+1 −10
Original line number Diff line number Diff line
@@ -4621,16 +4621,7 @@ bool dc_link_is_fec_supported(const struct dc_link *link) 
	 */

	struct link_encoder *link_enc = NULL;



	/* Links supporting dynamically assigned link encoder will be assigned next

	 * available encoder if one not already assigned.

	 */

	if (link->is_dig_mapping_flexible &&

			link->dc->res_pool->funcs->link_encs_assign) {

		link_enc = link_enc_cfg_get_link_enc_used_by_link(link->ctx->dc, link);

		if (link_enc == NULL)

			link_enc = link_enc_cfg_get_next_avail_link_enc(link->ctx->dc);

	} else

		link_enc = link->link_enc;

	link_enc = link_enc_cfg_get_link_enc(link);

	ASSERT(link_enc);



	return (dc_is_dp_signal(link->connector_signal) && link_enc &&

drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c

+5 −61
Original line number Diff line number Diff line
@@ -261,14 +261,7 @@ static enum dc_dp_training_pattern decide_eq_training_pattern(struct dc_link *li 
	struct dpcd_caps *rx_caps = &link->dpcd_caps;

	enum dc_dp_training_pattern pattern = DP_TRAINING_PATTERN_SEQUENCE_2;



	/* Access link encoder capability based on whether it is statically

	 * or dynamically assigned to a link.

	 */

	if (link->is_dig_mapping_flexible &&

			link->dc->res_pool->funcs->link_encs_assign)

		link_enc = link_enc_cfg_get_link_enc_used_by_link(link->ctx->dc, link);

	else

		link_enc = link->link_enc;

	link_enc = link_enc_cfg_get_link_enc(link);

	ASSERT(link_enc);

	enc_caps = &link_enc->features;
@@ -2997,16 +2990,7 @@ bool dc_link_dp_get_max_link_enc_cap(const struct dc_link *link, struct dc_link_ 
		return false;

	}



	/* Links supporting dynamically assigned link encoder will be assigned next

	 * available encoder if one not already assigned.

	 */

	if (link->is_dig_mapping_flexible &&

			link->dc->res_pool->funcs->link_encs_assign) {

		link_enc = link_enc_cfg_get_link_enc_used_by_link(link->ctx->dc, link);

		if (link_enc == NULL)

			link_enc = link_enc_cfg_get_next_avail_link_enc(link->ctx->dc);

	} else

		link_enc = link->link_enc;

	link_enc = link_enc_cfg_get_link_enc(link);

	ASSERT(link_enc);



	if (link_enc && link_enc->funcs->get_max_link_cap) {
@@ -3027,16 +3011,7 @@ struct dc_link_settings dp_get_max_link_cap(struct dc_link *link) 
	enum dc_link_rate lttpr_max_link_rate;

	struct link_encoder *link_enc = NULL;



	/* Links supporting dynamically assigned link encoder will be assigned next

	 * available encoder if one not already assigned.

	 */

	if (link->is_dig_mapping_flexible &&

			link->dc->res_pool->funcs->link_encs_assign) {

		link_enc = link_enc_cfg_get_link_enc_used_by_link(link->ctx->dc, link);

		if (link_enc == NULL)

			link_enc = link_enc_cfg_get_next_avail_link_enc(link->ctx->dc);

	} else

		link_enc = link->link_enc;

	link_enc = link_enc_cfg_get_link_enc(link);

	ASSERT(link_enc);



	/* get max link encoder capability */
@@ -6175,14 +6150,7 @@ enum dc_status dp_set_fec_ready(struct dc_link *link, const struct link_resource 
	enum dc_status status = DC_OK;

	uint8_t fec_config = 0;



	/* Access link encoder based on whether it is statically

	 * or dynamically assigned to a link.

	 */

	if (link->is_dig_mapping_flexible &&

			link->dc->res_pool->funcs->link_encs_assign)

		link_enc = link_enc_cfg_get_link_enc_used_by_link(link->ctx->dc, link);

	else

		link_enc = link->link_enc;

	link_enc = link_enc_cfg_get_link_enc(link);

	ASSERT(link_enc);



	if (!dc_link_should_enable_fec(link))
@@ -6222,14 +6190,7 @@ void dp_set_fec_enable(struct dc_link *link, bool enable) 
{

	struct link_encoder *link_enc = NULL;



	/* Access link encoder based on whether it is statically

	 * or dynamically assigned to a link.

	 */

	if (link->is_dig_mapping_flexible &&

			link->dc->res_pool->funcs->link_encs_assign)

		link_enc = link_enc_cfg_get_link_enc_used_by_link(link->ctx->dc, link);

	else

		link_enc = link->link_enc;

	link_enc = link_enc_cfg_get_link_enc(link);

	ASSERT(link_enc);



	if (!dc_link_should_enable_fec(link))
@@ -6255,23 +6216,6 @@ void dp_set_fec_enable(struct dc_link *link, bool enable) 
	}

}



struct link_encoder *dp_get_link_enc(struct dc_link *link)

{

	struct link_encoder *link_enc;



	link_enc = link->link_enc;

	if (link->is_dig_mapping_flexible &&

	    link->dc->res_pool->funcs->link_encs_assign) {

		link_enc = link_enc_cfg_get_link_enc_used_by_link(link->ctx->dc,

								  link);

		if (!link->link_enc)

			link_enc = link_enc_cfg_get_next_avail_link_enc(

				link->ctx->dc);

	}



	return link_enc;

}



void dpcd_set_source_specific_data(struct dc_link *link)

{

	if (!link->dc->vendor_signature.is_valid) {

drivers/gpu/drm/amd/display/dc/core/dc_link_enc_cfg.c

+22 −1
Original line number Diff line number Diff line
@@ -486,7 +486,8 @@ struct link_encoder *link_enc_cfg_get_next_avail_link_enc(struct dc *dc) 
	}



	for (i = 0; i < dc->res_pool->res_cap->num_dig_link_enc; i++) {

		if (encs_assigned[i] == ENGINE_ID_UNKNOWN) {

		if (encs_assigned[i] == ENGINE_ID_UNKNOWN &&

				dc->res_pool->link_encoders[i] != NULL) {

			link_enc = dc->res_pool->link_encoders[i];

			break;

		}
@@ -506,6 +507,26 @@ struct link_encoder *link_enc_cfg_get_link_enc_used_by_stream( 
	return link_enc;

}



struct link_encoder *link_enc_cfg_get_link_enc(

		const struct dc_link *link)

{

	struct link_encoder *link_enc = NULL;



	/* Links supporting dynamically assigned link encoder will be assigned next

	 * available encoder if one not already assigned.

	 */

	if (link->is_dig_mapping_flexible &&

	    link->dc->res_pool->funcs->link_encs_assign) {

		link_enc = link_enc_cfg_get_link_enc_used_by_link(link->ctx->dc, link);

		if (link_enc == NULL)

			link_enc = link_enc_cfg_get_next_avail_link_enc(

				link->ctx->dc);

	} else

		link_enc = link->link_enc;



	return link_enc;

}



bool link_enc_cfg_is_link_enc_avail(struct dc *dc, enum engine_id eng_id, struct dc_link *link)

{

	bool is_avail = true;

drivers/gpu/drm/amd/display/dc/core/dc_link_hwss.c

+4 −18
Original line number Diff line number Diff line
@@ -86,11 +86,7 @@ void dp_enable_link_phy( 
			link->dc->res_pool->dp_clock_source;

	unsigned int i;



	/* Link should always be assigned encoder when en-/disabling. */

	if (link->is_dig_mapping_flexible && dc->res_pool->funcs->link_encs_assign)

		link_enc = link_enc_cfg_get_link_enc_used_by_link(dc, link);

	else

		link_enc = link->link_enc;

	link_enc = link_enc_cfg_get_link_enc(link);

	ASSERT(link_enc);



	if (link->connector_signal == SIGNAL_TYPE_EDP) {
@@ -228,11 +224,7 @@ void dp_disable_link_phy(struct dc_link *link, const struct link_resource *link_ 
	struct hpo_dp_link_encoder *hpo_link_enc = link_res->hpo_dp_link_enc;

	struct link_encoder *link_enc;



	/* Link should always be assigned encoder when en-/disabling. */

	if (link->is_dig_mapping_flexible && dc->res_pool->funcs->link_encs_assign)

		link_enc = link_enc_cfg_get_link_enc_used_by_link(dc, link);

	else

		link_enc = link->link_enc;

	link_enc = link_enc_cfg_get_link_enc(link);

	ASSERT(link_enc);



	if (!link->wa_flags.dp_keep_receiver_powered)
@@ -360,14 +352,8 @@ void dp_set_hw_test_pattern( 
	struct link_encoder *encoder;

	enum dp_link_encoding link_encoding_format = dp_get_link_encoding_format(&link->cur_link_settings);



	/* Access link encoder based on whether it is statically

	 * or dynamically assigned to a link.

	 */

	if (link->is_dig_mapping_flexible &&

			link->dc->res_pool->funcs->link_encs_assign)

		encoder = link_enc_cfg_get_link_enc_used_by_link(link->ctx->dc, link);

	else

		encoder = link->link_enc;

	encoder = link_enc_cfg_get_link_enc(link);

	ASSERT(encoder);



	pattern_param.dp_phy_pattern = test_pattern;

	pattern_param.custom_pattern = custom_pattern;