* FAILED: patch "[PATCH] Revert "drm/amd/display: Fix memory leaks in S3 resume"" failed to apply to 5.10-stable tree
@ 2021-01-11 8:59 gregkh
2021-01-11 14:40 ` Deucher, Alexander
0 siblings, 1 reply; 4+ messages in thread
From: gregkh @ 2021-01-11 8:59 UTC (permalink / raw)
To: alexander.deucher, andre, harry.wentland, nicholas.kazlauskas,
oleksandr, stylon.wang
Cc: stable
The patch below does not apply to the 5.10-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 <stable@vger.kernel.org>.
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 5efc1f4b454c6179d35e7b0c3eda0ad5763a00fc Mon Sep 17 00:00:00 2001
From: Alex Deucher <alexander.deucher@amd.com>
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 <stylon.wang@amd.com>
Cc: Harry Wentland <harry.wentland@amd.com>
Cc: Nicholas Kazlauskas <nicholas.kazlauskas@amd.com>
Cc: Andre Tomt <andre@tomt.net>
Cc: Oleksandr Natalenko <oleksandr@natalenko.name>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
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 3fb6baf9b0ba..146486071d01 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -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,
^ permalink raw reply related [flat|nested] 4+ messages in thread
* RE: FAILED: patch "[PATCH] Revert "drm/amd/display: Fix memory leaks in S3 resume"" failed to apply to 5.10-stable tree
2021-01-11 8:59 FAILED: patch "[PATCH] Revert "drm/amd/display: Fix memory leaks in S3 resume"" failed to apply to 5.10-stable tree gregkh
@ 2021-01-11 14:40 ` Deucher, Alexander
2021-01-11 14:54 ` gregkh
0 siblings, 1 reply; 4+ messages in thread
From: Deucher, Alexander @ 2021-01-11 14:40 UTC (permalink / raw)
To: gregkh, andre, Wentland, Harry, Kazlauskas, Nicholas, oleksandr,
Wang, Chao-kai (Stylon)
Cc: stable
[AMD Public Use]
> -----Original Message-----
> From: gregkh@linuxfoundation.org <gregkh@linuxfoundation.org>
> Sent: Monday, January 11, 2021 3:59 AM
> To: Deucher, Alexander <Alexander.Deucher@amd.com>; andre@tomt.net;
> Wentland, Harry <Harry.Wentland@amd.com>; Kazlauskas, Nicholas
> <Nicholas.Kazlauskas@amd.com>; oleksandr@natalenko.name; Wang,
> Chao-kai (Stylon) <Stylon.Wang@amd.com>
> Cc: stable@vger.kernel.org
> Subject: FAILED: patch "[PATCH] Revert "drm/amd/display: Fix memory leaks
> in S3 resume"" failed to apply to 5.10-stable tree
>
>
> The patch below does not apply to the 5.10-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
> <stable@vger.kernel.org>.
>
This patch is already in 5.10. The revert ended up going to stable and upstream at the same time. Sorry for the confusion.
Alex
> thanks,
>
> greg k-h
>
> ------------------ original commit in Linus's tree ------------------
>
> From 5efc1f4b454c6179d35e7b0c3eda0ad5763a00fc Mon Sep 17 00:00:00
> 2001
> From: Alex Deucher <alexander.deucher@amd.com>
> 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&data=04%7C01%7Cal
> exander.deucher%40amd.com%7C289ab8e4d59b4cc7091208d8b60f035e%7C
> 3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637459522892609085%7
> CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJ
> BTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=54bcvpMtYCw98Nb1S
> DeNC6LZOoY365gnM9054qMo8tM%3D&reserved=0
> Bug:
> https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgitla
> b.freedesktop.org%2Fdrm%2Famd%2F-
> %2Fissues%2F1427&data=04%7C01%7Calexander.deucher%40amd.com
> %7C289ab8e4d59b4cc7091208d8b60f035e%7C3dd8961fe4884e608e11a82d99
> 4e183d%7C0%7C0%7C637459522892609085%7CUnknown%7CTWFpbGZsb3d8
> eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3
> D%7C1000&sdata=uSJC2lY4Bm%2BxiecaPXivfncCUEsb1%2FKJ%2Fudaxsl
> TGs4%3D&reserved=0
> Cc: Stylon Wang <stylon.wang@amd.com>
> Cc: Harry Wentland <harry.wentland@amd.com>
> Cc: Nicholas Kazlauskas <nicholas.kazlauskas@amd.com>
> Cc: Andre Tomt <andre@tomt.net>
> Cc: Oleksandr Natalenko <oleksandr@natalenko.name>
> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
> Cc: stable@vger.kernel.org
>
> 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 3fb6baf9b0ba..146486071d01 100644
> --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> @@ -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,
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: FAILED: patch "[PATCH] Revert "drm/amd/display: Fix memory leaks in S3 resume"" failed to apply to 5.10-stable tree
2021-01-11 14:40 ` Deucher, Alexander
@ 2021-01-11 14:54 ` gregkh
0 siblings, 0 replies; 4+ messages in thread
From: gregkh @ 2021-01-11 14:54 UTC (permalink / raw)
To: Deucher, Alexander
Cc: andre, Wentland, Harry, Kazlauskas, Nicholas, oleksandr, Wang,
Chao-kai (Stylon),
stable
On Mon, Jan 11, 2021 at 02:40:27PM +0000, Deucher, Alexander wrote:
> [AMD Public Use]
>
> > -----Original Message-----
> > From: gregkh@linuxfoundation.org <gregkh@linuxfoundation.org>
> > Sent: Monday, January 11, 2021 3:59 AM
> > To: Deucher, Alexander <Alexander.Deucher@amd.com>; andre@tomt.net;
> > Wentland, Harry <Harry.Wentland@amd.com>; Kazlauskas, Nicholas
> > <Nicholas.Kazlauskas@amd.com>; oleksandr@natalenko.name; Wang,
> > Chao-kai (Stylon) <Stylon.Wang@amd.com>
> > Cc: stable@vger.kernel.org
> > Subject: FAILED: patch "[PATCH] Revert "drm/amd/display: Fix memory leaks
> > in S3 resume"" failed to apply to 5.10-stable tree
> >
> >
> > The patch below does not apply to the 5.10-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
> > <stable@vger.kernel.org>.
> >
>
> This patch is already in 5.10. The revert ended up going to stable and upstream at the same time. Sorry for the confusion.
Ah, I thought I had seen this go by, too many patches...
thanks for letting me know.
greg k-h
^ permalink raw reply [flat|nested] 4+ messages in thread
* FAILED: patch "[PATCH] Revert "drm/amd/display: Fix memory leaks in S3 resume"" failed to apply to 5.10-stable tree
@ 2021-03-01 10:02 gregkh
0 siblings, 0 replies; 4+ messages in thread
From: gregkh @ 2021-03-01 10:02 UTC (permalink / raw)
To: alexander.deucher, andre, harry.wentland, nicholas.kazlauskas,
oleksandr, stylon.wang
Cc: stable
The patch below does not apply to the 5.10-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 <stable@vger.kernel.org>.
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 8768ff5efae35acea81b3f0c7db6a7ef519b0861 Mon Sep 17 00:00:00 2001
From: Alex Deucher <alexander.deucher@amd.com>
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 <stylon.wang@amd.com>
Cc: Harry Wentland <harry.wentland@amd.com>
Cc: Nicholas Kazlauskas <nicholas.kazlauskas@amd.com>
Cc: Andre Tomt <andre@tomt.net>
Cc: Oleksandr Natalenko <oleksandr@natalenko.name>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
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 0d2e334be87a..318eb12f8de7 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -2385,8 +2385,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,
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-03-01 10:04 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-01-11 8:59 FAILED: patch "[PATCH] Revert "drm/amd/display: Fix memory leaks in S3 resume"" failed to apply to 5.10-stable tree gregkh
2021-01-11 14:40 ` Deucher, Alexander
2021-01-11 14:54 ` gregkh
2021-03-01 10:02 gregkh
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.