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

Commit 7ba01f9e authored by Shaoyun Liu's avatar Shaoyun Liu Committed by Alex Deucher
Browse files

drm/amdgpu: Fix NULL pointer when load kfd driver with PP block is disabled 



When PP block is disabled, return a fix value(100M) for mclk and sclk on
bare-metal mode. This will cover the emulation mode as well.

Signed-off-by: default avatarShaoyun Liu <Shaoyun.Liu@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent ac26b0f3

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

+7 −11
Original line number Diff line number Diff line
@@ -336,15 +336,12 @@ void get_local_mem_info(struct kgd_dev *kgd, 
			mem_info->local_mem_size_public,

			mem_info->local_mem_size_private);



	if (amdgpu_emu_mode == 1) {

		mem_info->mem_clk_max = 100;

		return;

	}



	if (amdgpu_sriov_vf(adev))

		mem_info->mem_clk_max = adev->clock.default_mclk / 100;

	else

	else if (adev->powerplay.pp_funcs)

		mem_info->mem_clk_max = amdgpu_dpm_get_mclk(adev, false) / 100;

	else

		mem_info->mem_clk_max = 100;

}



uint64_t get_gpu_clock_counter(struct kgd_dev *kgd)
@@ -361,13 +358,12 @@ uint32_t get_max_engine_clock_in_mhz(struct kgd_dev *kgd) 
	struct amdgpu_device *adev = (struct amdgpu_device *)kgd;



	/* the sclk is in quantas of 10kHz */

	if (amdgpu_emu_mode == 1)

		return 100;



	if (amdgpu_sriov_vf(adev))

		return adev->clock.default_sclk / 100;



	else if (adev->powerplay.pp_funcs)

		return amdgpu_dpm_get_sclk(adev, false) / 100;

	else

		return 100;

}



void get_cu_info(struct kgd_dev *kgd, struct kfd_cu_info *cu_info)