summarylogtreecommitdiffstats
path: root/0007-Revert-drm-amd-display-Fix-memory-leaks-in-S3-resume.patch
diff options
context:
space:
mode:
Diffstat (limited to '0007-Revert-drm-amd-display-Fix-memory-leaks-in-S3-resume.patch')
-rw-r--r--0007-Revert-drm-amd-display-Fix-memory-leaks-in-S3-resume.patch40
1 files changed, 0 insertions, 40 deletions
diff --git a/0007-Revert-drm-amd-display-Fix-memory-leaks-in-S3-resume.patch b/0007-Revert-drm-amd-display-Fix-memory-leaks-in-S3-resume.patch
deleted file mode 100644
index 2297f857e277..000000000000
--- a/0007-Revert-drm-amd-display-Fix-memory-leaks-in-S3-resume.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From a70000cd95f7d55a8df0a7f5e0ed41c5656a0f53 Mon Sep 17 00:00:00 2001
-From: Alex Deucher <alexdeucher@gmail.com>
-Date: Tue, 5 Jan 2021 11:45:45 -0500
-Subject: [PATCH 7/8] 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.
-
-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
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 3 +--
- 1 file changed, 1 insertion(+), 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 30c6b9edddb5..0f7749e9424d 100644
---- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
-+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
-@@ -2278,8 +2278,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,
---
-2.30.0
-