drm/radeon/dpm: implement vblank_too_short callback for CI
authorAlex Deucher <alexander.deucher@amd.com>
Mon, 15 Jul 2013 22:24:31 +0000 (18:24 -0400)
committerAlex Deucher <alexander.deucher@amd.com>
Fri, 30 Aug 2013 20:30:31 +0000 (16:30 -0400)
Check if we can switch the mclk during the vblank time otherwise
we may get artifacts on the screen when the mclk changes.

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/radeon/ci_dpm.c
drivers/gpu/drm/radeon/radeon_asic.c
drivers/gpu/drm/radeon/radeon_asic.h

index 9eebf1f7e223bfdeadb3d4d53516831b0b7a4625..6e3d387a7388ec8180541ff9a390cc7c43fa859b 100644 (file)
@@ -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;
index 705bc7498ff260051e099eb5befe982287e0bb78..2d7bdda90bbabea4de37b83960c7b2dd6b758dda 100644 (file)
@@ -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,
index a88792865fa41bc95c8d46ebef1b0c8be69c7f02..b5f4e431c49358b224003a603468f2580b35064c 100644 (file)
@@ -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);