Patch "Revert "drm/amd/display: Fix memory leaks in S3 resume"" has been added to the 5.4-stable tree

[gregkh at linuxfoundation.org]

This is a note to let you know that I've just added the patch titled

    Revert "drm/amd/display: Fix memory leaks in S3 resume"

to the 5.4-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     revert-drm-amd-display-fix-memory-leaks-in-s3-resume.patch
and it can be found in the queue-5.4 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable at vger.kernel.org> know about it.


>From alexdeucher at gmail.com  Wed Jan  6 17:47:17 2021
From: Alex Deucher <alexdeucher at gmail.com>
Date: Tue,  5 Jan 2021 11:45:45 -0500
Subject: Revert "drm/amd/display: Fix memory leaks in S3 resume"
To: amd-gfx at lists.freedesktop.org
Cc: Alex Deucher <alexander.deucher at amd.com>, Stylon Wang <stylon.wang at amd.com>, Harry Wentland <harry.wentland at amd.com>, Nicholas Kazlauskas <nicholas.kazlauskas at amd.com>, Andre Tomt <andre at tomt.net>, Oleksandr Natalenko <oleksandr at natalenko.name>, stable at vger.kernel.org
Message-ID: <20210105164545.963036-1-alexander.deucher at amd.com>

From: Alex Deucher <alexdeucher at gmail.com>

This reverts commit a135a1b4c4db1f3b8cbed9676a40ede39feb3362.

This leads to blank screens on some boards after replugging a
display.  Revert until we understand the root cause and can
fix both the leak and the blank screen after replug.

Cc: Stylon Wang <stylon.wang at amd.com>
Cc: Harry Wentland <harry.wentland at amd.com>
Cc: Nicholas Kazlauskas <nicholas.kazlauskas at amd.com>
Cc: Andre Tomt <andre at tomt.net>
Cc: Oleksandr Natalenko <oleksandr at natalenko.name>
Signed-off-by: Alex Deucher <alexander.deucher at amd.com>
Cc: stable at vger.kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh at linuxfoundation.org>
---
 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -1434,8 +1434,7 @@ amdgpu_dm_update_connector_after_detect(
 
 			drm_connector_update_edid_property(connector,
 							   aconnector->edid);
-			aconnector->num_modes = drm_add_edid_modes(connector, aconnector->edid);
-			drm_connector_list_update(connector);
+			drm_add_edid_modes(connector, aconnector->edid);
 
 			if (aconnector->dc_link->aux_mode)
 				drm_dp_cec_set_edid(&aconnector->dm_dp_aux.aux,


Patches currently in stable-queue which might be from alexdeucher at gmail.com are

queue-5.4/revert-drm-amd-display-fix-memory-leaks-in-s3-resume.patch