Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 85ee15d6 authored by Mikita Lipski's avatar Mikita Lipski Committed by Alex Deucher
Browse files

drm/amd/display: Do not skip FBC init in failsafe mode 



Initially FBC would be initialized if display's edid was correct
and all the modes acquired from it, but n case when edid is corrupted
or non-existant we must still initialize FBC.

Signed-off-by: default avatarMikita Lipski <mikita.lipski@amd.com>
Reviewed-by: default avatarTony Cheng <Tony.Cheng@amd.com>
Acked-by: default avatarHarry Wentland <harry.wentland@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent e9522309

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

+6 −6
Original line number Diff line number Diff line
@@ -3425,12 +3425,12 @@ static int amdgpu_dm_connector_get_modes(struct drm_connector *connector) 


	encoder = helper->best_encoder(connector);



	if (!edid || !drm_edid_is_valid(edid))

		return drm_add_modes_noedid(connector, 640, 480);



	if (!edid || !drm_edid_is_valid(edid)) {

		drm_add_modes_noedid(connector, 640, 480);

	} else {

		amdgpu_dm_connector_ddc_get_modes(connector, edid);

		amdgpu_dm_connector_add_common_modes(encoder, connector);



	}

	amdgpu_dm_fbc_init(connector);



	return amdgpu_dm_connector->num_modes;