Skip to contentSkip to conversation

FAILED: patch "[PATCH] Revert "drm/amd/display: Fix memory leaks in S3 resume"" failed to apply to 5.4-stable tree

PATCH [email protected] 2 participants 2 messages Jan 11, 2021

Subsystems (4)
Stable branch DRM drivers Radeon and amdgpu DRM drivers AMD display core
lore
Share & tools
lore

[email protected]

author maintainer
#0 lore raw

The patch below does not apply to the 5.4-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From 5efc1f4b454c6179d35e7b0c3eda0ad5763a00fc Mon Sep 17 00:00:00 2001
From: Alex Deucher <[email protected]>
Date: Tue, 5 Jan 2021 11:42:08 -0500
Subject: [PATCH] Revert "drm/amd/display: Fix memory leaks in S3 resume"

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.

Bug https://bugzilla.kernel.org/show_bug.cgi?id=211033
Bug https://gitlab.freedesktop.org/drm/amd/-/issues/1427
Cc Stylon Wang <[email protected]>
Cc Harry Wentland <[email protected]>
Cc Nicholas Kazlauskas <[email protected]>
Cc Andre Tomt <[email protected]>
Cc Oleksandr Natalenko <[email protected]>
Signed-off-by Alex Deucher <[email protected]>
Cc [email protected]
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +1 -2
index 3fb6baf9b0ba..146486071d01 100644
@@ -2386,8 +2386,7 @@ void 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,
maintainer
#1 lore raw

[AMD Public Use]

Quoted 12 lines

-----Original Message-----
From: [email protected] <[email protected]>
Sent: Monday, January 11, 2021 3:59 AM
To: Deucher, Alexander <[email protected]>; [email protected]; Wentland, Harry <[email protected]>; Kazlauskas, Nicholas <[email protected]>; [email protected]; Wang, Chao-kai (Stylon) <[email protected]>
Cc: [email protected]
Subject: FAILED: patch "[PATCH] Revert "drm/amd/display: Fix memory leaks in S3 resume"" failed to apply to 5.4-stable tree

Quoted 4 lines

The patch below does not apply to the 5.4-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

This patch is already in 5.4. The revert ended up going to stable and upstream at the same time. Sorry for the confusion.

Alex

Quoted 63 lines

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From 5efc1f4b454c6179d35e7b0c3eda0ad5763a00fc Mon Sep 17 00:00:00 2001
From: Alex Deucher <[email protected]>
Date: Tue, 5 Jan 2021 11:42:08 -0500
Subject: [PATCH] Revert "drm/amd/display: Fix memory leaks in S3 resume"

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.

Bug:
https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Fbugz
illa.kernel.org%2Fshow_bug.cgi%3Fid%3D211033&amp;data=04%7C01%7Cal exander.deucher%40amd.com%7C84b09c22c469404992b308d8b60efe6b%7C 3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637459522804784905%7 CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJ BTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&amp;sdata=COVjAY9N%2By6Psbo gUWfTTWVGUdC4KDHv5UmmycvxLcM%3D&amp;reserved=0
Bug:
https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgitla
b.freedesktop.org%2Fdrm%2Famd%2F- %2Fissues%2F1427&amp;data=04%7C01%7Calexander.deucher%40amd.com %7C84b09c22c469404992b308d8b60efe6b%7C3dd8961fe4884e608e11a82d99 4e183d%7C0%7C0%7C637459522804784905%7CUnknown%7CTWFpbGZsb3d8 eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3 D%7C1000&amp;sdata=QsldTtqFAIda6pQBpQ%2FmuE0CcYqbm3BeOZbGyjQ hbn0%3D&amp;reserved=0

Cc Stylon Wang <[email protected]>
Cc Harry Wentland <[email protected]>
Cc Nicholas Kazlauskas <[email protected]>
Cc Andre Tomt <[email protected]>
Cc Oleksandr Natalenko <[email protected]>
Signed-off-by Alex Deucher <[email protected]>
Cc [email protected]
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +0 -0
index 3fb6baf9b0ba..146486071d01 100644
@@ -2386,8 +2386,7 @@ void

amdgpu_dm_update_connector_after_detect(

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +0 -1
 			drm_connector_update_edid_property(connector,
 							   aconnector->edid);
-			aconnector->num_modes =

drm_add_edid_modes(connector, aconnector->edid);

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +1 -1
-			drm_connector_list_update(connector);
+			drm_add_edid_modes(connector, aconnector-
Quoted 1 line

edid);

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +0 -0
 			if (aconnector->dc_link->aux_mode)
 				drm_dp_cec_set_edid(&aconnector-
Quoted 1 line

dm_dp_aux.aux,