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

Commit 84bcd469 authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/radeon/tn/si: enable/disable vce cg when encoding v2 



Some of the vce clocks are automatic, others need to
be manually enabled.  For ease, just disable cg when
vce is active.

v2: rebased, call vce_v1_0_enable_mgcg directly

Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent d55a43a3

drivers/gpu/drm/radeon/si_dpm.c

+8 −1
Original line number Diff line number Diff line
@@ -1740,6 +1740,7 @@ struct ni_power_info *ni_get_pi(struct radeon_device *rdev); 
struct ni_ps *ni_get_ps(struct radeon_ps *rps);



extern int si_mc_load_microcode(struct radeon_device *rdev);

extern void vce_v1_0_enable_mgcg(struct radeon_device *rdev, bool enable);



static int si_populate_voltage_value(struct radeon_device *rdev,

				     const struct atom_voltage_table *table,
@@ -5932,9 +5933,15 @@ static void si_set_vce_clock(struct radeon_device *rdev, 
			     struct radeon_ps *old_rps)

{

	if ((old_rps->evclk != new_rps->evclk) ||

	    (old_rps->ecclk != new_rps->ecclk))

	    (old_rps->ecclk != new_rps->ecclk)) {

		/* turn the clocks on when encoding, off otherwise */

		if (new_rps->evclk || new_rps->ecclk)

			vce_v1_0_enable_mgcg(rdev, false);

		else

			vce_v1_0_enable_mgcg(rdev, true);

		radeon_set_vce_clocks(rdev, new_rps->evclk, new_rps->ecclk);

	}

}



void si_dpm_setup_asic(struct radeon_device *rdev)

{

drivers/gpu/drm/radeon/trinity_dpm.c

+8 −1
Original line number Diff line number Diff line
@@ -336,6 +336,7 @@ static const u32 trinity_override_mgpg_sequences[] = 
	0x00000204, 0x00000000,

};



extern void vce_v1_0_enable_mgcg(struct radeon_device *rdev, bool enable);

static void trinity_program_clk_gating_hw_sequence(struct radeon_device *rdev,

						   const u32 *seq, u32 count);

static void trinity_override_dynamic_mg_powergating(struct radeon_device *rdev);
@@ -990,9 +991,15 @@ static void trinity_set_vce_clock(struct radeon_device *rdev, 
				  struct radeon_ps *old_rps)

{

	if ((old_rps->evclk != new_rps->evclk) ||

	    (old_rps->ecclk != new_rps->ecclk))

	    (old_rps->ecclk != new_rps->ecclk)) {

		/* turn the clocks on when encoding, off otherwise */

		if (new_rps->evclk || new_rps->ecclk)

			vce_v1_0_enable_mgcg(rdev, false);

		else

			vce_v1_0_enable_mgcg(rdev, true);

		radeon_set_vce_clocks(rdev, new_rps->evclk, new_rps->ecclk);

	}

}



static void trinity_program_ttt(struct radeon_device *rdev)

{