From: Greg Kroah-Hartman Date: Tue, 25 Jul 2023 13:44:52 +0000 (+0200) Subject: 5.15-stable patches X-Git-Tag: v5.4.251~5 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3d4dee54d812b8339718b60b8b437d200796c480;p=thirdparty%2Fkernel%2Fstable-queue.git 5.15-stable patches added patches: revert-drm-amd-display-edp-do-not-add-non-edid-timings.patch --- diff --git a/queue-5.15/revert-drm-amd-display-edp-do-not-add-non-edid-timings.patch b/queue-5.15/revert-drm-amd-display-edp-do-not-add-non-edid-timings.patch new file mode 100644 index 00000000000..4bd5b151db0 --- /dev/null +++ b/queue-5.15/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 +@@ -8209,13 +8209,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-5.15/series b/queue-5.15/series index e81fd5cd703..ae9df37c9b7 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -76,3 +76,4 @@ net-phy-prevent-stale-pointer-dereference-in-phy_ini.patch jbd2-recheck-chechpointing-non-dirty-buffer.patch tracing-histograms-return-an-error-if-we-fail-to-add-histogram-to-hist_vars-list.patch nixge-fix-mac-address-error-handling-again.patch +revert-drm-amd-display-edp-do-not-add-non-edid-timings.patch