drm/amdgpu: update mall info v2 from discovery
Subsystems (2)
PATCH 1/2 drm/amdgpu: update mall info v2 from discovery
Mall info v2 is introduced in ip discovery
--- drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 5 +++++ drivers/gpu/drm/amd/include/discovery.h | 8 +++++++- 2 files changed, 12 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c +5 -0
@@ -1478,6 +1478,7 @@ static int amdgpu_discovery_get_gfx_info(struct amdgpu_device *adev)union mall_info {struct mall_info_v1_0 v1; +struct mall_info_v2_0 v2; };static int amdgpu_discovery_get_mall_info (struct amdgpu_device *adev)
@@ -1518,6 +1519,10 @@ static int amdgpu_discovery_get_mall_info(struct amdgpu_device *adev) adev->gmc.mall_size = mall_size; adev->gmc.m_half_use = half_use;break ; +case 2 : + mall_size_per_umc =le32_to_cpu (mall_info->v2.mall_size_per_umc); + adev->gmc.mall_size = mall_size_per_umc * adev->gmc.num_umc; +break ;default : dev_err(adev->dev, "Unhandled MALL info table %d.%d\n",
drivers/gpu/drm/amd/include/discovery.h +7 -1
@@ -30,7 +30,7 @@#define GC_TABLE_ID 0x4347#define HARVEST_TABLE_SIGNATURE 0x56524148#define VCN_INFO_TABLE_ID 0x004E4356 -#define MALL_INFO_TABLE_ID 0x4D414C4C +#define MALL_INFO_TABLE_ID 0x4C4C414D typedef enum {
@@ -312,6 +312,12 @@ struct mall_info_v1_0 {uint32_t reserved[5 ]; }; +struct mall_info_v2_0 { +struct mall_info_header header; +uint32_t mall_size_per_umc; +uint32_t reserved[8 ]; +}; +#define VCN_INFO_TABLE_MAX_NUM_INSTANCES 4struct vcn_info_header {
Signature · 1 line
2.38.1
PATCH 2/2 drm/amdgpu: update gc_info v2_1 from discovery
Several new fields are exposed in gc_info v2_1
--- drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 10 +++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h | 3 ++ drivers/gpu/drm/amd/include/discovery.h | 30 +++++++++++++++++++ 3 files changed, 43 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c +10 -0
@@ -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
@@ -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
@@ -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 */
Signature · 1 line
2.38.1
RE: [PATCH 2/2] drm/amdgpu: update gc_info v2_1 from discovery
[AMD Official Use Only - General]
Regards,
Hawking
-----Original Message-----
From: amd-gfx <[email protected]> On Behalf Of Le Ma
Sent: Thursday, August 17, 2023 11:33
To: [email protected]
Cc: Zhang, Morris <[email protected]>
Subject: [PATCH 2/2] drm/amdgpu: update gc_info v2_1 from discovery
Several new fields are exposed in gc_info v2_1
--- drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 10 +++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h | 3 ++ drivers/gpu/drm/amd/include/discovery.h | 30 +++++++++++++++++++ 3 files changed, 43 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c +1 -0
@@ -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
@@ -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
@@ -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 */
--
2.38.1
RE: [PATCH 2/2] drm/amdgpu: update gc_info v2_1 from discovery
In reply to Le Ma[AMD Official Use Only - General]
Regards,
Hawking
-----Original Message-----
From: amd-gfx <[email protected]> On Behalf Of Le Ma
Sent: Thursday, August 17, 2023 11:33
To: [email protected]
Cc: Zhang, Morris <[email protected]>
Subject: [PATCH 2/2] drm/amdgpu: update gc_info v2_1 from discovery
Several new fields are exposed in gc_info v2_1
--- drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 10 +++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h | 3 ++ drivers/gpu/drm/amd/include/discovery.h | 30 +++++++++++++++++++ 3 files changed, 43 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c +1 -0
@@ -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
@@ -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
@@ -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 */
--
2.38.1
Quoted 5 lines · On 8/17/2023 9:02 AM, Le Ma wrote:
Mall info v2 is introduced in ip discovery
Change-Id Ia2e49e7679c578065f85059a077fc08c9f84615cSigned-off-by Le Ma <[email protected]>Reviewed-by Shiwu Zhang <[email protected]>
Series is -
Thanks,
Lijo
Quoted 54 lines
--- drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 5 +++++ drivers/gpu/drm/amd/include/discovery.h | 8 +++++++- 2 files changed, 12 insertions(+), 1 deletion(-)drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c +5
-0@@ -1478,6 +1478,7 @@ static int amdgpu_discovery_get_gfx_info(struct amdgpu_device *adev)union mall_info {struct mall_info_v1_0 v1; +struct mall_info_v2_0 v2; };static int amdgpu_discovery_get_mall_info (struct amdgpu_device *adev)@@ -1518,6 +1519,10 @@ static int amdgpu_discovery_get_mall_info(struct amdgpu_device *adev) adev->gmc.mall_size = mall_size; adev->gmc.m_half_use = half_use;break ; +case 2 : + mall_size_per_umc =le32_to_cpu (mall_info->v2.mall_size_per_umc); + adev->gmc.mall_size = mall_size_per_umc * adev->gmc.num_umc; +break ;default : dev_err(adev->dev, "Unhandled MALL info table %d.%d\n",drivers/gpu/drm/amd/include/discovery.h +7
-1@@ -30,7 +30,7 @@#define GC_TABLE_ID 0x4347#define HARVEST_TABLE_SIGNATURE 0x56524148#define VCN_INFO_TABLE_ID 0x004E4356 -#define MALL_INFO_TABLE_ID 0x4D414C4C +#define MALL_INFO_TABLE_ID 0x4C4C414D typedef enum {@@ -312,6 +312,12 @@ struct mall_info_v1_0 {uint32_t reserved[5 ]; }; +struct mall_info_v2_0 { +struct mall_info_header header; +uint32_t mall_size_per_umc; +uint32_t reserved[8 ]; +}; +#define VCN_INFO_TABLE_MAX_NUM_INSTANCES 4struct vcn_info_header {