1 files changed, 0 insertions, 70 deletions
diff --git a/meta-r1000/recipes-kernel/linux/linux-yocto-4.14.71/4956-drm-amd-display-Add-hook-for-MST-root-branch-info.patch b/meta-r1000/recipes-kernel/linux/linux-yocto-4.14.71/4956-drm-amd-display-Add-hook-for-MST-root-branch-info.patch
deleted file mode 100644
index dd7c9630..00000000
--- a/meta-r1000/recipes-kernel/linux/linux-yocto-4.14.71/4956-drm-amd-display-Add-hook-for-MST-root-branch-info.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From 1d231e8a2e95cb77c102766951a0447a7695a77b Mon Sep 17 00:00:00 2001
-From: Nikola Cornij <nikola.cornij@amd.com>
-Date: Wed, 4 Jul 2018 19:05:16 -0400
-Subject: [PATCH 4956/5725] 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>
----
- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 5 +++++
- drivers/gpu/drm/amd/display/dc/core/dc_link.c             | 4 ++++
- drivers/gpu/drm/amd/display/dc/dm_helpers.h               | 8 ++++++++
- 3 files changed, 17 insertions(+)
-
-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 4188dbd..d1ce925 100644
---- 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 f058620..a621467 100644
---- 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 7e6b9f5..5d4527d0 100644
---- 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.
-  */
--- 
-2.7.4
-