From: jsg <jsg@openbsd.org>
Date: Thu, 20 Jul 2023 08:51:39 +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=7147bc02a432f1db816a251556d1f3e26c0a4f12;p=openbsd

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

From Hersen Wu
b91748bdbfb10673bc128179eb71cf66cb9641c4 in linux-6.1.y/6.1.39
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 21e07a101aa..188708ec0c4 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
@@ -6974,13 +6974,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);