From: Stylon Wang <stylon.wang@amd.com>
Date: Tue, 5 Jan 2021 03:29:34 +0000 (+0800)
Subject: drm/amd/display: Revert "Fix EDID parsing after resume from suspend"
X-Git-Tag: baikal/aarch64/sdk6.1~7223^2~5^2~18
X-Git-Url: https://git.baikalelectronics.ru/sdk/?a=commitdiff_plain;h=ac985f12ca83bc926d93a372111c5463ef0e60c2;p=kernel.git

drm/amd/display: Revert "Fix EDID parsing after resume from suspend"

This reverts commit 6d1204d28168ab6a00a36d7686984826d0c739c6.
It caused memory leak after S3 on 4K HDMI displays.

Signed-off-by: Stylon Wang <stylon.wang@amd.com>
Reviewed-by: Rodrigo Siqueira <Rodrigo.Siqueira@amd.com>
Acked-by: Anson Jacob <Anson.Jacob@amd.com>
Tested-by: Daniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---

diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
index 96ba8252249e3..c145dd48974be 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -2348,8 +2348,6 @@ void amdgpu_dm_update_connector_after_detect(
 
 			drm_connector_update_edid_property(connector,
 							   aconnector->edid);
-			drm_add_edid_modes(connector, aconnector->edid);
-
 			if (aconnector->dc_link->aux_mode)
 				drm_dp_cec_set_edid(&aconnector->dm_dp_aux.aux,
 						    aconnector->edid);