Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5496131e authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/radeon/dpm: implement vblank_too_short callback for CI 



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: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 89536fd6

drivers/gpu/drm/radeon/ci_dpm.c

+15 −1
Original line number Diff line number Diff line
@@ -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;

drivers/gpu/drm/radeon/radeon_asic.c

+1 −0
Original line number Diff line number Diff line
@@ -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,

drivers/gpu/drm/radeon/radeon_asic.h

+1 −0
Original line number Diff line number Diff line
@@ -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);