Commit 46b55e25 authored by Le Ma's avatar Le Ma Committed by Alex Deucher
Browse files

drm/amdgpu: update gc_info v2_1 from discovery 



Several new fields are exposed in gc_info v2_1

Signed-off-by: default avatarLe Ma <le.ma@amd.com>
Reviewed-by: default avatarShiwu Zhang <shiwu.zhang@amd.com>
Reviewed-by: default avatarHawking Zhang <Hawking.Zhang@amd.com>
Reviewed-by: default avatarLijo Lazar <lijo.lazar@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent d4f6425a

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

+10 −0
Original line number Diff line number Diff line
@@ -1390,6 +1390,7 @@ union gc_info { 
	struct gc_info_v1_1 v1_1;

	struct gc_info_v1_2 v1_2;

	struct gc_info_v2_0 v2;

	struct gc_info_v2_1 v2_1;

};



static int amdgpu_discovery_get_gfx_info(struct amdgpu_device *adev)
@@ -1465,6 +1466,15 @@ static int amdgpu_discovery_get_gfx_info(struct amdgpu_device *adev) 
		adev->gfx.config.num_sc_per_sh = le32_to_cpu(gc_info->v2.gc_num_sc_per_se) /

			le32_to_cpu(gc_info->v2.gc_num_sh_per_se);

		adev->gfx.config.num_packer_per_sc = le32_to_cpu(gc_info->v2.gc_num_packer_per_sc);

		if (gc_info->v2.header.version_minor == 1) {

			adev->gfx.config.gc_num_tcp_per_sa = le32_to_cpu(gc_info->v2_1.gc_num_tcp_per_sh);

			adev->gfx.config.gc_tcp_size_per_cu = le32_to_cpu(gc_info->v2_1.gc_tcp_size_per_cu);

			adev->gfx.config.gc_num_sdp_interface = le32_to_cpu(gc_info->v2_1.gc_num_sdp_interface); /* per XCD */

			adev->gfx.config.gc_num_cu_per_sqc = le32_to_cpu(gc_info->v2_1.gc_num_cu_per_sqc);

			adev->gfx.config.gc_l1_instruction_cache_size_per_sqc = le32_to_cpu(gc_info->v2_1.gc_instruction_cache_size_per_sqc);

			adev->gfx.config.gc_l1_data_cache_size_per_sqc = le32_to_cpu(gc_info->v2_1.gc_scalar_data_cache_size_per_sqc);

			adev->gfx.config.gc_tcc_size = le32_to_cpu(gc_info->v2_1.gc_tcc_size); /* per XCD */

		}

		break;

	default:

		dev_err(adev->dev,

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

+3 −0
Original line number Diff line number Diff line
@@ -241,6 +241,9 @@ struct amdgpu_gfx_config { 
	uint32_t gc_gl1c_per_sa;

	uint32_t gc_gl1c_size_per_instance;

	uint32_t gc_gl2c_per_gpu;

	uint32_t gc_tcp_size_per_cu;

	uint32_t gc_num_cu_per_sqc;

	uint32_t gc_tcc_size;

};



struct amdgpu_cu_info {

drivers/gpu/drm/amd/include/discovery.h

+30 −0
Original line number Diff line number Diff line
@@ -280,6 +280,36 @@ struct gc_info_v2_0 { 
	uint32_t gc_num_packer_per_sc;

};



struct gc_info_v2_1 {

	struct gpu_info_header header;



	uint32_t gc_num_se;

	uint32_t gc_num_cu_per_sh;

	uint32_t gc_num_sh_per_se;

	uint32_t gc_num_rb_per_se;

	uint32_t gc_num_tccs;

	uint32_t gc_num_gprs;

	uint32_t gc_num_max_gs_thds;

	uint32_t gc_gs_table_depth;

	uint32_t gc_gsprim_buff_depth;

	uint32_t gc_parameter_cache_depth;

	uint32_t gc_double_offchip_lds_buffer;

	uint32_t gc_wave_size;

	uint32_t gc_max_waves_per_simd;

	uint32_t gc_max_scratch_slots_per_cu;

	uint32_t gc_lds_size;

	uint32_t gc_num_sc_per_se;

	uint32_t gc_num_packer_per_sc;

	/* new for v2_1 */

	uint32_t gc_num_tcp_per_sh;

	uint32_t gc_tcp_size_per_cu;

	uint32_t gc_num_sdp_interface;

	uint32_t gc_num_cu_per_sqc;

	uint32_t gc_instruction_cache_size_per_sqc;

	uint32_t gc_scalar_data_cache_size_per_sqc;

	uint32_t gc_tcc_size;

};



typedef struct harvest_info_header {

	uint32_t signature; /* Table Signature */

	uint32_t version;   /* Table Version */