Commit 1b369d3c authored Jul 26, 2018 by Mikita Lipski Committed by Alex Deucher Aug 27, 2018

drm/amd/display: pass the right num of modes added



[why]
In case if edid is null or corrupted we need to manually add
a single failsafe mode (640x480). If zero modes returned
DRM adds a different failsafe mode that is not accepted by
DP 1.2 compliance test

[how]
Return the number of modes manually added

Signed-off-by: Mikita Lipski <mikita.lipski@amd.com>
Reviewed-by: Sun peng Li <Sunpeng.Li@amd.com>
Acked-by: Bhawanpreet Lakha <Bhawanpreet.Lakha@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

parent 2cddc50e

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -3468,6 +3468,7 @@ static int amdgpu_dm_connector_get_modes(struct drm_connector *connector)
	encoder = helper->best_encoder(connector);		encoder = helper->best_encoder(connector);

	if (!edid \|\| !drm_edid_is_valid(edid)) {		if (!edid \|\| !drm_edid_is_valid(edid)) {
			amdgpu_dm_connector->num_modes =
	drm_add_modes_noedid(connector, 640, 480);		drm_add_modes_noedid(connector, 640, 480);
	} else {		} else {
	amdgpu_dm_connector_ddc_get_modes(connector, edid);		amdgpu_dm_connector_ddc_get_modes(connector, edid);