Commit 49ed6f45 authored by Leo Li's avatar Leo Li Committed by Alex Deucher
Browse files

drm/amd/display: Undo accidental fix revert in amdgpu_dm_ism.c 



[Why]

Pausing DPM power profiles during static screen caused a bunch of
audio/performance/clock issues that were addressed in this fix:
'commit 1412482b ("Revert "drm/amd/display: pause the workload setting in dm"")'

This logic in function amdgpu_dm_crtc_vblank_control_worker() was moved
to amdgpu_dm_ism.c, but the fix was lost in the process.

[How]

Reapply the fix to amdgpu_dm_ism.c

Fixes: 75400348 ("drm/amd/display: Add Idle state manager(ISM)")
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Reviewed-by: default avatarMario Limonciello (AMD) <superm1@kernel.org>
Signed-off-by: default avatarLeo Li <sunpeng.li@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
(cherry picked from commit bc621e91d6fc004cfae9148c5a91acad19ada3e4)
parent dd88d42d

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

+0 −10
Original line number Diff line number Diff line
@@ -270,7 +270,6 @@ static void dm_ism_commit_idle_optimization_state(struct amdgpu_dm_ism *ism, 
	struct amdgpu_crtc *acrtc = ism_to_amdgpu_crtc(ism);

	struct amdgpu_device *adev = drm_to_adev(acrtc->base.dev);

	struct amdgpu_display_manager *dm = &adev->dm;

	int r;



	trace_amdgpu_dm_ism_commit(dm->active_vblank_irq_count,

				   vblank_enabled,
@@ -323,16 +322,7 @@ static void dm_ism_commit_idle_optimization_state(struct amdgpu_dm_ism *ism, 
	 */

	if (!vblank_enabled && dm->active_vblank_irq_count == 0) {

		dc_post_update_surfaces_to_stream(dm->dc);



		r = amdgpu_dpm_pause_power_profile(adev, true);

		if (r)

			dev_warn(adev->dev, "failed to set default power profile mode\n");



		dc_allow_idle_optimizations(dm->dc, true);



		r = amdgpu_dpm_pause_power_profile(adev, false);

		if (r)

			dev_warn(adev->dev, "failed to restore the power profile mode\n");

	}

}