From 844bdc4975f6f60fb89b11da86d9ddfc56320218 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 25 Jul 2023 15:45:15 +0200 Subject: [PATCH] 6.1-stable patches added patches: revert-drm-amd-display-edp-do-not-add-non-edid-timings.patch --- ...play-edp-do-not-add-non-edid-timings.patch | 43 +++++++++++++++++++ queue-6.1/series | 1 + 2 files changed, 44 insertions(+) create mode 100644 queue-6.1/revert-drm-amd-display-edp-do-not-add-non-edid-timings.patch diff --git a/queue-6.1/revert-drm-amd-display-edp-do-not-add-non-edid-timings.patch b/queue-6.1/revert-drm-amd-display-edp-do-not-add-non-edid-timings.patch new file mode 100644 index 00000000000..9612d0dac74 --- /dev/null +++ b/queue-6.1/revert-drm-amd-display-edp-do-not-add-non-edid-timings.patch @@ -0,0 +1,43 @@ +From d6149086b45e150c170beaa4546495fd1880724c Mon Sep 17 00:00:00 2001 +From: Hersen Wu +Date: Mon, 26 Jun 2023 13:40:58 -0400 +Subject: Revert "drm/amd/display: edp do not add non-edid timings" + +From: Hersen Wu + +commit d6149086b45e150c170beaa4546495fd1880724c upstream. + +This change causes regression when eDP and external display in mirror +mode. When external display supports low resolution than eDP, use eDP +timing to driver external display may cause corruption on external +display. + +This reverts commit e749dd10e5f292061ad63d2b030194bf7d7d452c. + +Cc: stable@vger.kernel.org +Link: https://gitlab.freedesktop.org/drm/amd/-/issues/2655 +Signed-off-by: Hersen Wu +Reviewed-by: Mario Limonciello +Signed-off-by: Alex Deucher +Signed-off-by: Greg Kroah-Hartman +--- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 8 +------- + 1 file changed, 1 insertion(+), 7 deletions(-) + +--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c ++++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +@@ -6988,13 +6988,7 @@ static int amdgpu_dm_connector_get_modes + drm_add_modes_noedid(connector, 640, 480); + } else { + amdgpu_dm_connector_ddc_get_modes(connector, edid); +- /* most eDP supports only timings from its edid, +- * usually only detailed timings are available +- * from eDP edid. timings which are not from edid +- * may damage eDP +- */ +- if (connector->connector_type != DRM_MODE_CONNECTOR_eDP) +- amdgpu_dm_connector_add_common_modes(encoder, connector); ++ amdgpu_dm_connector_add_common_modes(encoder, connector); + amdgpu_dm_connector_add_freesync_modes(connector, edid); + } + amdgpu_dm_fbc_init(connector); diff --git a/queue-6.1/series b/queue-6.1/series index fff52a9eee0..e04c9e77628 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -181,3 +181,4 @@ drm-amd-display-force-connector-state-when-bpc-changes-during-compliance.patch drm-amd-display-clean-up-errors-warnings-in-amdgpu_dm.c.patch drm-amd-display-fix-linux-dp-link-lost-handled-only-one-time.patch drm-amd-display-add-polling-method-to-handle-mst-reply-packet.patch +revert-drm-amd-display-edp-do-not-add-non-edid-timings.patch -- 2.47.3