3 files changed, 17 insertions, 1 deletions

diff --git a/drivers/gpu/drm/radeon/ci_dpm.c b/drivers/gpu/drm/radeon/ci_dpm.c
index 9eebf1f7e223..6e3d387a7388 100644
--- a/drivers/gpu/drm/radeon/ci_dpm.c
+++ b/drivers/gpu/drm/radeon/ci_dpm.c
@@ -682,6 +682,19 @@ static void ci_dpm_powergate_uvd(struct radeon_device *rdev, bool gate)
         ci_update_uvd_dpm(rdev, gate);
 }
 
+bool ci_dpm_vblank_too_short(struct radeon_device *rdev)
+{
+        struct ci_power_info *pi = ci_get_pi(rdev);
+        u32 vblank_time = r600_dpm_get_vblank_time(rdev);
+        u32 switch_limit = pi->mem_gddr5 ? 450 : 300;
+
+        if (vblank_time < switch_limit)
+                return true;
+        else
+                return false;
+
+}
+
 static void ci_apply_state_adjust_rules(struct radeon_device *rdev,
                                         struct radeon_ps *rps)
 {
@@ -692,7 +705,8 @@ static void ci_apply_state_adjust_rules(struct radeon_device *rdev,
         u32 sclk, mclk;
         int i;
 
-        if (rdev->pm.dpm.new_active_crtc_count > 1)
+        if ((rdev->pm.dpm.new_active_crtc_count > 1) ||
+            ci_dpm_vblank_too_short(rdev))
                 disable_mclk_switching = true;
         else
                 disable_mclk_switching = false;
diff --git a/drivers/gpu/drm/radeon/radeon_asic.c b/drivers/gpu/drm/radeon/radeon_asic.c
index 705bc7498ff2..2d7bdda90bba 100644
--- a/drivers/gpu/drm/radeon/radeon_asic.c
+++ b/drivers/gpu/drm/radeon/radeon_asic.c
@@ -2469,6 +2469,7 @@ static struct radeon_asic ci_asic = {
                 .print_power_state = &ci_dpm_print_power_state,
                 .debugfs_print_current_performance_level = &ci_dpm_debugfs_print_current_performance_level,
                 .force_performance_level = &ci_dpm_force_performance_level,
+                .vblank_too_short = &ci_dpm_vblank_too_short,
         },
         .pflip = {
                 .pre_page_flip = &evergreen_pre_page_flip,
diff --git a/drivers/gpu/drm/radeon/radeon_asic.h b/drivers/gpu/drm/radeon/radeon_asic.h
index a88792865fa4..b5f4e431c493 100644
--- a/drivers/gpu/drm/radeon/radeon_asic.h
+++ b/drivers/gpu/drm/radeon/radeon_asic.h
@@ -767,6 +767,7 @@ void ci_dpm_debugfs_print_current_performance_level(struct radeon_device *rdev,
                                                     struct seq_file *m);
 int ci_dpm_force_performance_level(struct radeon_device *rdev,
                                    enum radeon_dpm_forced_level level);
+bool ci_dpm_vblank_too_short(struct radeon_device *rdev);
 
 int kv_dpm_init(struct radeon_device *rdev);
 int kv_dpm_enable(struct radeon_device *rdev);