Commit 4d22336f authored by Michel Dänzer's avatar Michel Dänzer Committed by Alex Deucher
Browse files

drm/amd/display: For vblank_disable_immediate, check PSR is really used 



Even if PSR is allowed for a present GPU, there might be no eDP link
which supports PSR.

Fixes: 70897848 ("drm/amdgpu/display: Only set vblank_disable_immediate when PSR is not enabled")
Reviewed-by: default avatarHarry Wentland <harry.wentland@amd.com>
Signed-off-by: default avatarMichel Dänzer <mdaenzer@redhat.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent e3f38248

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

+9 −8
Original line number Diff line number Diff line
@@ -4256,6 +4256,9 @@ static int amdgpu_dm_initialize_drm_device(struct amdgpu_device *adev) 
	}

#endif



	/* Disable vblank IRQs aggressively for power-saving. */

	adev_to_drm(adev)->vblank_disable_immediate = true;



	/* loops over all connectors on the board */

	for (i = 0; i < link_cnt; i++) {

		struct dc_link *link = NULL;
@@ -4301,19 +4304,17 @@ static int amdgpu_dm_initialize_drm_device(struct amdgpu_device *adev) 
				update_connector_ext_caps(aconnector);

			if (psr_feature_enabled)

				amdgpu_dm_set_psr_caps(link);



			/* TODO: Fix vblank control helpers to delay PSR entry to allow this when

			 * PSR is also supported.

			 */

			if (link->psr_settings.psr_feature_enabled)

				adev_to_drm(adev)->vblank_disable_immediate = false;

		}





	}



	/*

	 * Disable vblank IRQs aggressively for power-saving.

	 *

	 * TODO: Fix vblank control helpers to delay PSR entry to allow this when PSR

	 * is also supported.

	 */

	adev_to_drm(adev)->vblank_disable_immediate = !psr_feature_enabled;



	/* Software is initialized. Now we can register interrupt handlers. */

	switch (adev->asic_type) {

#if defined(CONFIG_DRM_AMD_DC_SI)