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

Commit ebdebf42 authored by Flora Cui's avatar Flora Cui Committed by Oded Gabbay
Browse files

drm/amdgpu: add amdgpu interface to query cu info 



Signed-off-by: default avatarFlora Cui <flora.cui@amd.com>
Signed-off-by: default avatarHarish Kasiviswanathan <Harish.Kasiviswanathan@amd.com>
Signed-off-by: default avatarFelix Kuehling <Felix.Kuehling@amd.com>
Reviewed-by: default avatarOded Gabbay <oded.gabbay@gmail.com>
Signed-off-by: default avatarOded Gabbay <oded.gabbay@gmail.com>
parent 8cce58fe

drivers/gpu/drm/amd/amdgpu/amdgpu.h

+1 −0
Original line number Diff line number Diff line
@@ -959,6 +959,7 @@ struct amdgpu_gfx_config { 
};



struct amdgpu_cu_info {

	uint32_t simd_per_cu;

	uint32_t max_waves_per_simd;

	uint32_t wave_front_size;

	uint32_t max_scratch_slots_per_cu;

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

+23 −0
Original line number Diff line number Diff line
@@ -304,3 +304,26 @@ uint32_t get_max_engine_clock_in_mhz(struct kgd_dev *kgd) 


	return amdgpu_dpm_get_sclk(adev, false) / 100;

}



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

{

	struct amdgpu_device *adev = (struct amdgpu_device *)kgd;

	struct amdgpu_cu_info acu_info = adev->gfx.cu_info;



	memset(cu_info, 0, sizeof(*cu_info));

	if (sizeof(cu_info->cu_bitmap) != sizeof(acu_info.bitmap))

		return;



	cu_info->cu_active_number = acu_info.number;

	cu_info->cu_ao_mask = acu_info.ao_cu_mask;

	memcpy(&cu_info->cu_bitmap[0], &acu_info.bitmap[0],

	       sizeof(acu_info.bitmap));

	cu_info->num_shader_engines = adev->gfx.config.max_shader_engines;

	cu_info->num_shader_arrays_per_engine = adev->gfx.config.max_sh_per_se;

	cu_info->num_cu_per_sh = adev->gfx.config.max_cu_per_sh;

	cu_info->simd_per_cu = acu_info.simd_per_cu;

	cu_info->max_waves_per_simd = acu_info.max_waves_per_simd;

	cu_info->wave_front_size = acu_info.wave_front_size;

	cu_info->max_scratch_slots_per_cu = acu_info.max_scratch_slots_per_cu;

	cu_info->lds_size = acu_info.lds_size;

}

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

+1 −0
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ uint64_t get_vmem_size(struct kgd_dev *kgd); 
uint64_t get_gpu_clock_counter(struct kgd_dev *kgd);



uint32_t get_max_engine_clock_in_mhz(struct kgd_dev *kgd);

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



#define read_user_wptr(mmptr, wptr, dst)				\

	({								\

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

+1 −0
Original line number Diff line number Diff line
@@ -200,6 +200,7 @@ static const struct kfd2kgd_calls kfd2kgd = { 
	.get_fw_version = get_fw_version,

	.set_scratch_backing_va = set_scratch_backing_va,

	.get_tile_config = get_tile_config,

	.get_cu_info = get_cu_info

};



struct kfd2kgd_calls *amdgpu_amdkfd_gfx_7_get_functions(void)

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

+1 −0
Original line number Diff line number Diff line
@@ -161,6 +161,7 @@ static const struct kfd2kgd_calls kfd2kgd = { 
	.get_fw_version = get_fw_version,

	.set_scratch_backing_va = set_scratch_backing_va,

	.get_tile_config = get_tile_config,

	.get_cu_info = get_cu_info

};



struct kfd2kgd_calls *amdgpu_amdkfd_gfx_8_0_get_functions(void)