Commit 72010239 authored by Likun Gao's avatar Likun Gao Committed by Alex Deucher
Browse files

drm/amdgpu: add MGCG perfmon setting for gfx11 



Enable GFX11 MGCG perfmon setting.
V2: set rlc to saft mode before setting.

Signed-off-by: default avatarLikun Gao <Likun.Gao@amd.com>
Reviewed-by: default avatarHawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent d3ef9d57

drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c

+3 −0
Original line number Diff line number Diff line
@@ -131,6 +131,8 @@ static void gfx_v11_0_ring_invalidate_tlbs(struct amdgpu_ring *ring, 
					   bool all_hub, uint8_t dst_sel);

static void gfx_v11_0_set_safe_mode(struct amdgpu_device *adev);

static void gfx_v11_0_unset_safe_mode(struct amdgpu_device *adev);

static void gfx_v11_0_update_perf_clk(struct amdgpu_device *adev,

				      bool enable);



static void gfx11_kiq_set_resources(struct amdgpu_ring *kiq_ring, uint64_t queue_mask)

{
@@ -1139,6 +1141,7 @@ static const struct amdgpu_gfx_funcs gfx_v11_0_gfx_funcs = { 
	.read_wave_vgprs = &gfx_v11_0_read_wave_vgprs,

	.select_me_pipe_q = &gfx_v11_0_select_me_pipe_q,

	.init_spm_golden = &gfx_v11_0_init_spm_golden_registers,

	.update_perfmon_mgcg = &gfx_v11_0_update_perf_clk,

};



static int gfx_v11_0_gpu_early_init(struct amdgpu_device *adev)

drivers/gpu/drm/amd/amdgpu/soc21.c

+15 −0
Original line number Diff line number Diff line
@@ -494,6 +494,20 @@ static void soc21_pre_asic_init(struct amdgpu_device *adev) 
{

}



static int soc21_update_umd_stable_pstate(struct amdgpu_device *adev,

					  bool enter)

{

	if (enter)

		amdgpu_gfx_rlc_enter_safe_mode(adev);

	else

		amdgpu_gfx_rlc_exit_safe_mode(adev);



	if (adev->gfx.funcs->update_perfmon_mgcg)

		adev->gfx.funcs->update_perfmon_mgcg(adev, !enter);



	return 0;

}



static const struct amdgpu_asic_funcs soc21_asic_funcs =

{

	.read_disabled_bios = &soc21_read_disabled_bios,
@@ -513,6 +527,7 @@ static const struct amdgpu_asic_funcs soc21_asic_funcs = 
	.supports_baco = &amdgpu_dpm_is_baco_supported,

	.pre_asic_init = &soc21_pre_asic_init,

	.query_video_codecs = &soc21_query_video_codecs,

	.update_umd_stable_pstate = &soc21_update_umd_stable_pstate,

};



static int soc21_common_early_init(void *handle)