From: jsg <jsg@openbsd.org>
Date: Fri, 28 Jul 2023 07:10:26 +0000 (+0000)
Subject: Revert "drm/amd/display: edp do not add non-edid timings"
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=29ce8fc7ed9fc7f6da7e07eb42ef90d794e806a0;p=openbsd

Revert "drm/amd/display: edp do not add non-edid timings"

From Hersen Wu
1d4607f2a50c749e47a4b80030733cbf77c5570a in linux-6.1.y/6.1.42
d6149086b45e150c170beaa4546495fd1880724c in mainline linux
---

diff --git a/sys/dev/pci/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/sys/dev/pci/drm/amd/display/amdgpu_dm/amdgpu_dm.c
index ca5c4e75baf..680376c8f5a 100644
--- a/sys/dev/pci/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/sys/dev/pci/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -6990,13 +6990,7 @@ static int amdgpu_dm_connector_get_modes(struct drm_connector *connector)
 				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);