drm/amd/display: Add hook for MST root branch info

This allows DM to do any necessary updates before MST discovery starts.

Signed-off-by: Nikola Cornij <nikola.cornij@amd.com>
Reviewed-by: Nikola Cornij <Nikola.Cornij@amd.com>
Acked-by: Leo Li <sunpeng.li@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c
index 59b113d11f66f009ecc284a27f5047dfd7a89c4c..8403b6a9a77bd0008ab30b67153db5392206a5b6 100644 (file)
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c
@@ -169,6 +169,11 @@ static void get_payload_table(
        mutex_unlock(&mst_mgr->payload_lock);
 }
 
+void dm_helpers_dp_update_branch_info(
+       struct dc_context *ctx,
+       const struct dc_link *link)
+{}
+
 /*
  * Writes payload allocation table in immediate downstream device.
  */

diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_link.c b/drivers/gpu/drm/amd/display/dc/core/dc_link.c
index fe29a398b70399c2b52213fcc36d69e9b85751a0..a4429c90c60c4ac8a6ca2e952bd0821c915891f1 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/core/dc_link.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc_link.c
@@ -529,6 +529,10 @@ static bool detect_dp(
                        if (reason == DETECT_REASON_BOOT)
                                boot = true;
 
+                       dm_helpers_dp_update_branch_info(
+                               link->ctx,
+                               link);
+
                        if (!dm_helpers_dp_mst_start_top_mgr(
                                link->ctx,
                                link, boot)) {

diff --git a/drivers/gpu/drm/amd/display/dc/dm_helpers.h b/drivers/gpu/drm/amd/display/dc/dm_helpers.h
index 7e6b9f5b890616d0d10a899133289b1e1c31aa4b..5d4527d03045e1902f65bf5f5ea511dd58875f04 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dm_helpers.h
+++ b/drivers/gpu/drm/amd/display/dc/dm_helpers.h
@@ -40,6 +40,14 @@ enum dc_edid_status dm_helpers_parse_edid_caps(
        const struct dc_edid *edid,
        struct dc_edid_caps *edid_caps);
 
+
+/*
+ * Update DP branch info
+ */
+void dm_helpers_dp_update_branch_info(
+               struct dc_context *ctx,
+               const struct dc_link *link);
+
 /*
  * Writes payload allocation table in immediate downstream device.
  */