drm/amdgpu: check min clock set by DAL before set ps.

Signed-off-by: Rex Zhu <Rex.Zhu@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/ci_dpm.c b/drivers/gpu/drm/amd/amdgpu/ci_dpm.c
index 885f08c3f496fde3a3bf1e0ce76b38477b3f342b..68fe70eda5ada2d96355bef15250723f0da6eb6b 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/ci_dpm.c
+++ b/drivers/gpu/drm/amd/amdgpu/ci_dpm.c
@@ -960,6 +960,12 @@ static void ci_apply_state_adjust_rules(struct amdgpu_device *adev,
                sclk = ps->performance_levels[0].sclk;
        }
 
+       if (adev->pm.pm_display_cfg.min_core_set_clock > sclk)
+               sclk = adev->pm.pm_display_cfg.min_core_set_clock;
+
+       if (adev->pm.pm_display_cfg.min_mem_set_clock > mclk)
+               mclk = adev->pm.pm_display_cfg.min_mem_set_clock;
+
        if (rps->vce_active) {
                if (sclk < adev->pm.dpm.vce_states[adev->pm.dpm.vce_level].sclk)
                        sclk = adev->pm.dpm.vce_states[adev->pm.dpm.vce_level].sclk;