niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

drm/amd/display: populate link res in both detection and validation

Browse source 
[why]
This commit is to populate link res in preparation of the next commit.
The next commit will replace all existing code to use link res instead

Tested-by: Daniel Wheeler <daniel.wheeler@amd.com>
Reviewed-by: Jun Lei <Jun.Lei@amd.com>
Acked-by: Rodrigo Siqueira <Rodrigo.Siqueira@amd.com>
Signed-off-by: Wenjing Liu <wenjing.liu@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Wenjing Liu 2021-11-26 18:46:22 -05:00 • committed by Alex Deucher
parent ef30f441f6
commit f3fac9481b
3 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
drivers/gpu/drm/amd/display/dc/core/dc_link.c
View file

@ -881,6 +881,7 @@ static bool dc_link_detect_helper(struct dc_link *link,
enum dc_connection_type pre_connection_type = dc_connection_none; enum dc_connection_type pre_connection_type = dc_connection_none;
bool perform_dp_seamless_boot = false; bool perform_dp_seamless_boot = false;
const uint32_t post_oui_delay = 30; // 30ms const uint32_t post_oui_delay = 30; // 30ms
struct link_resource link_res = { 0 };
DC_LOGGER_INIT(link->ctx->logger); DC_LOGGER_INIT(link->ctx->logger);
@ -974,8 +975,10 @@ static bool dc_link_detect_helper(struct dc_link *link,
} }
#if defined(CONFIG_DRM_AMD_DC_DCN) #if defined(CONFIG_DRM_AMD_DC_DCN)
if (dp_get_link_encoding_format(&link->reported_link_cap) == DP_128b_132b_ENCODING) if (dp_get_link_encoding_format(&link->reported_link_cap) == DP_128b_132b_ENCODING) {
add_dp_hpo_link_encoder_to_link(link); add_dp_hpo_link_encoder_to_link(link);
link_res.hpo_dp_link_enc = link->hpo_dp_link_enc;
}
#endif #endif
if (link->type == dc_connection_mst_branch) { if (link->type == dc_connection_mst_branch) {
@ -986,7 +989,7 @@ static bool dc_link_detect_helper(struct dc_link *link,
* empty which leads to allocate_mst_payload() has "0" * empty which leads to allocate_mst_payload() has "0"
* pbn_per_slot value leading to exception on dc_fixpt_div() * pbn_per_slot value leading to exception on dc_fixpt_div()
*/ */
dp_verify_mst_link_cap(link, NULL); dp_verify_mst_link_cap(link, &link_res);
/* /*
* This call will initiate MST topology discovery. Which * This call will initiate MST topology discovery. Which
@ -1150,7 +1153,7 @@ static bool dc_link_detect_helper(struct dc_link *link,
// verify link cap for SST non-seamless boot // verify link cap for SST non-seamless boot
if (!perform_dp_seamless_boot) if (!perform_dp_seamless_boot)
dp_verify_link_cap_with_retries(link, dp_verify_link_cap_with_retries(link,
NULL, &link_res,
&link->reported_link_cap, &link->reported_link_cap,
LINK_TRAINING_MAX_VERIFY_RETRY); LINK_TRAINING_MAX_VERIFY_RETRY);
} else { } else {

1
drivers/gpu/drm/amd/display/dc/core/dc_resource.c
View file

@ -2161,6 +2161,7 @@ enum dc_status resource_map_pool_resources(
&context->res_ctx, pool, &context->res_ctx, pool,
pipe_ctx->stream_res.hpo_dp_stream_enc, pipe_ctx->stream_res.hpo_dp_stream_enc,
true); true);
pipe_ctx->link_res.hpo_dp_link_enc = stream->link->hpo_dp_link_enc;
} }
} }
#endif #endif

4
drivers/gpu/drm/amd/display/dc/inc/core_types.h
View file

@ -336,7 +336,11 @@ struct plane_resource {
/* all mappable hardware resources used to enable a link */ /* all mappable hardware resources used to enable a link */
struct link_resource { struct link_resource {
#if defined(CONFIG_DRM_AMD_DC_DCN)
struct hpo_dp_link_encoder *hpo_dp_link_enc;
#else
void *dummy; void *dummy;
#endif
}; };
union pipe_update_flags { union pipe_update_flags {