summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorStylon Wang <stylon.wang@amd.com>2021-01-05 11:29:34 +0800
committerAlex Deucher <alexander.deucher@amd.com>2021-02-02 17:42:00 -0500
commit1a10e5244778169a5a53a527d7830cf0438132a1 (patch)
treea2cd9150d7352f534cfd1c1e7283b482074394cc /drivers
parent1622711beebe887e4f0f8237fea1f09bb48e9a51 (diff)
downloadlwn-1a10e5244778169a5a53a527d7830cf0438132a1.tar.gz
lwn-1a10e5244778169a5a53a527d7830cf0438132a1.zip
drm/amd/display: Revert "Fix EDID parsing after resume from suspend"
This reverts commit b24bdc37d03a0478189e20a50286092840f414fa. 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> Cc: stable@vger.kernel.org
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c2
1 files changed, 0 insertions, 2 deletions
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 0757328e3085..8d496fe36dd2 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -2346,8 +2346,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);