Add GFX 11.5 support
Subsystems (3)
Alex Deucher
maintainercover Add GFX 11.5 support
Add support for GFX 11.5. Add the relevant
changes to the existing GFX 11 code.
The register headers in patch 1 are too large
for the mailing list.
Aaron Liu (3):
drm/amdgpu: add golden setting for gc_11_5_0 drm/amdgpu: add imu firmware support for gc_11_5_0 drm/amdgpu: add mes firmware support for gc_11_5_0
Lang Yu (3):
drm/amdgpu: add gc headers for gc 11.5.0 drm/amdkfd: add KFD support for GC 11.5.0 drm/amdgpu/discovery: enable mes block for gc 11.5.0
Prike Liang (3):
drm/amdgpu/gmc11: initialize GMC for GC 11.5.0 memory support drm/amdgpu/gfx11: initialize gfx11.5.0 drm/amdgpu/discovery: enable gfx11 for GC 11.5.0
drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 2 + drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c | 34 +- drivers/gpu/drm/amd/amdgpu/gmc_v11_0.c | 1 + drivers/gpu/drm/amd/amdgpu/imu_v11_0.c | 1 + drivers/gpu/drm/amd/amdgpu/mes_v11_0.c | 3 + drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 1 + drivers/gpu/drm/amd/amdkfd/kfd_device.c | 7 + .../include/asic_reg/gc/gc_11_5_0_offset.h | 10000 +++++ .../include/asic_reg/gc/gc_11_5_0_sh_mask.h | 36531 ++++++++++++++++ 9 files changed, 46579 insertions(+), 1 deletion(-) create mode 100644 drivers/gpu/drm/amd/include/asic_reg/gc/gc_11_5_0_offset.h create mode 100644 drivers/gpu/drm/amd/include/asic_reg/gc/gc_11_5_0_sh_mask.h
Signature · 1 line
2.41.0
Alex Deucher
maintainerPATCH 2/9 drm/amdgpu/gmc11: initialize GMC for GC 11.5.0 memory support
From: Prike Liang <[email protected]>
Initialize vram attribute and VMHUB for GC 11.5.0.
--- drivers/gpu/drm/amd/amdgpu/gmc_v11_0.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/amd/amdgpu/gmc_v11_0.c +1 -0
@@ -781,6 +781,7 @@ static int gmc_v11_0_sw_init(void *handle)case IP_VERSION (11 ,0 ,2 ):case IP_VERSION (11 ,0 ,3 ):case IP_VERSION (11 ,0 ,4 ): +case IP_VERSION (11 ,5 ,0 ):set_bit (AMDGPU_GFXHUB (0 ), adev->vmhubs_mask);set_bit (AMDGPU_MMHUB0 (0 ), adev->vmhubs_mask);/*
Signature · 1 line
2.41.0
Alex Deucher
maintainerPATCH 3/9 drm/amdgpu/gfx11: initialize gfx11.5.0
In reply to Alex DeucherFrom: Prike Liang <[email protected]>
Initalize gfx 11.5.0 and set gfx hw configuration.
--- drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c +8 -1
@@ -82,6 +82,10 @@ MODULE_FIRMWARE("amdgpu/gc_11_0_4_pfp.bin");MODULE_FIRMWARE ("amdgpu/gc_11_0_4_me.bin" );MODULE_FIRMWARE ("amdgpu/gc_11_0_4_mec.bin" );MODULE_FIRMWARE ("amdgpu/gc_11_0_4_rlc.bin" ); +MODULE_FIRMWARE ("amdgpu/gc_11_5_0_pfp.bin" ); +MODULE_FIRMWARE ("amdgpu/gc_11_5_0_me.bin" ); +MODULE_FIRMWARE ("amdgpu/gc_11_5_0_mec.bin" ); +MODULE_FIRMWARE ("amdgpu/gc_11_5_0_rlc.bin" );static const struct soc15_reg_golden golden_settings_gc_11_0_1[] = {
@@ -876,6 +880,7 @@ static int gfx_v11_0_gpu_early_init(struct amdgpu_device *adev)break ;case IP_VERSION (11 ,0 ,1 ):case IP_VERSION (11 ,0 ,4 ): +case IP_VERSION (11 ,5 ,0 ): adev->gfx.config.max_hw_contexts =8 ; adev->gfx.config.sc_prim_fifo_size_frontend =0x20 ; adev->gfx.config.sc_prim_fifo_size_backend =0x100 ;
@@ -1316,6 +1321,7 @@ static int gfx_v11_0_sw_init(void *handle)break ;case IP_VERSION (11 ,0 ,1 ):case IP_VERSION (11 ,0 ,4 ): +case IP_VERSION (11 ,5 ,0 ): adev->gfx.me.num_me =1 ; adev->gfx.me.num_pipe_per_me =1 ; adev->gfx.me.num_queue_per_pipe =1 ;
@@ -2563,7 +2569,8 @@ static int gfx_v11_0_wait_for_rlc_autoload_complete(struct amdgpu_device *adev) cp_status =RREG32_SOC15 (GC ,0 , regCP_STAT);if (adev->ip_versions[GC_HWIP ][0 ] ==IP_VERSION (11 ,0 ,1 ) || - adev->ip_versions[GC_HWIP ][0 ] ==IP_VERSION (11 ,0 ,4 )) + adev->ip_versions[GC_HWIP ][0 ] ==IP_VERSION (11 ,0 ,4 ) || + adev->ip_versions[GC_HWIP ][0 ] ==IP_VERSION (11 ,5 ,0 )) bootload_status =RREG32_SOC15 (GC ,0 , regRLC_RLCS_BOOTLOAD_STATUS_gc_11_0_1);else
Signature · 1 line
2.41.0
Alex Deucher
maintainerPATCH 4/9 drm/amdgpu: add golden setting for gc_11_5_0
In reply to Alex DeucherFrom: Aaron Liu <[email protected]>
Initialize golden setting for gc_11_5_0.
v2: squash in latest golden updates (Alex)
--- drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+)
drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c +25 -0
@@ -60,6 +60,8 @@#define regCGTT_WD_CLK_CTRL_BASE_IDX 1#define regRLC_RLCS_BOOTLOAD_STATUS_gc_11_0_1 0x4e7e#define regRLC_RLCS_BOOTLOAD_STATUS_gc_11_0_1_BASE_IDX 1 +#define regPC_CONFIG_CNTL_1 0x194d +#define regPC_CONFIG_CNTL_1_BASE_IDX 1MODULE_FIRMWARE ("amdgpu/gc_11_0_0_pfp.bin" );MODULE_FIRMWARE ("amdgpu/gc_11_0_0_me.bin" );
@@ -100,6 +102,24 @@ static const struct soc15_reg_golden golden_settings_gc_11_0_1[] =SOC15_REG_GOLDEN_VALUE (GC ,0 , regTCP_CNTL2,0xfcffffff ,0x0000000a ) }; +static const struct soc15_reg_golden golden_settings_gc_11_5_0[] = +{ +SOC15_REG_GOLDEN_VALUE (GC ,0 , regDB_DEBUG5,0xffffffff ,0x00000800 ), +SOC15_REG_GOLDEN_VALUE (GC ,0 , regGB_ADDR_CONFIG,0x0c1807ff ,0x00000242 ), +SOC15_REG_GOLDEN_VALUE (GC ,0 , regGCR_GENERAL_CNTL,0x1ff1ffff ,0x00000500 ), +SOC15_REG_GOLDEN_VALUE (GC ,0 , regGL2A_ADDR_MATCH_MASK,0xffffffff ,0xfffffff3 ), +SOC15_REG_GOLDEN_VALUE (GC ,0 , regGL2C_ADDR_MATCH_MASK,0xffffffff ,0xfffffff3 ), +SOC15_REG_GOLDEN_VALUE (GC ,0 , regGL2C_CTRL,0xffffffff ,0xf37fff3f ), +SOC15_REG_GOLDEN_VALUE (GC ,0 , regGL2C_CTRL3,0xfffffffb ,0x00f40188 ), +SOC15_REG_GOLDEN_VALUE (GC ,0 , regGL2C_CTRL4,0xf0ffffff ,0x8000b007 ), +SOC15_REG_GOLDEN_VALUE (GC ,0 , regPA_CL_ENHANCE,0xf1ffffff ,0x00880007 ), +SOC15_REG_GOLDEN_VALUE (GC ,0 , regPC_CONFIG_CNTL_1,0xffffffff ,0x00010000 ), +SOC15_REG_GOLDEN_VALUE (GC ,0 , regTA_CNTL_AUX,0xf7f7ffff ,0x01030000 ), +SOC15_REG_GOLDEN_VALUE (GC ,0 , regTA_CNTL2,0x007f0000 ,0x00000000 ), +SOC15_REG_GOLDEN_VALUE (GC ,0 , regTCP_CNTL2,0xffcfffff ,0x0000200a ), +SOC15_REG_GOLDEN_VALUE (GC ,0 , regUTCL1_CTRL_2,0xffffffff ,0x0000048f ) +}; +#define DEFAULT_SH_MEM_CONFIG \ ((SH_MEM_ADDRESS_MODE_64 << SH_MEM_CONFIG__ADDRESS_MODE__SHIFT) | \ (SH_MEM_ALIGNMENT_MODE_UNALIGNED << SH_MEM_CONFIG__ALIGNMENT_MODE__SHIFT) | \
@@ -276,6 +296,11 @@ static void gfx_v11_0_init_golden_registers(struct amdgpu_device *adev) golden_settings_gc_11_0_1, (const u32)ARRAY_SIZE(golden_settings_gc_11_0_1));break ; +case IP_VERSION (11 ,5 ,0 ): +soc15_program_register_sequence (adev, + golden_settings_gc_11_5_0, + (const u32 )ARRAY_SIZE (golden_settings_gc_11_5_0)); +break ;default :break ; }
Signature · 1 line
2.41.0
Alex Deucher
maintainerPATCH 5/9 drm/amdkfd: add KFD support for GC 11.5.0
In reply to Alex DeucherFrom: Lang Yu <[email protected]>
Enable KFD for GC 11.5.0.
--- drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 1 + drivers/gpu/drm/amd/amdkfd/kfd_device.c | 7 +++++++ 2 files changed, 8 insertions(+)
drivers/gpu/drm/amd/amdkfd/kfd_crat.c +1 -0
@@ -1522,6 +1522,7 @@ int kfd_get_gpu_cache_info(struct kfd_node *kdev, struct kfd_gpu_cache_info **pccase IP_VERSION (11 ,0 ,2 ):case IP_VERSION (11 ,0 ,3 ):case IP_VERSION (11 ,0 ,4 ): +case IP_VERSION (11 ,5 ,0 ): num_of_cache_types =kfd_fill_gpu_cache_info_from_gfx_config (kdev->kfd, *pcache_info);break ;
drivers/gpu/drm/amd/amdkfd/kfd_device.c +7 -0
@@ -95,6 +95,7 @@ static void kfd_device_info_set_sdma_info(struct kfd_dev *kfd)case IP_VERSION (6 ,0 ,1 ):case IP_VERSION (6 ,0 ,2 ):case IP_VERSION (6 ,0 ,3 ): +case IP_VERSION (6 ,1 ,0 ): kfd->device_info.num_sdma_queues_per_engine =8 ;break ;default :
@@ -111,6 +112,7 @@ static void kfd_device_info_set_sdma_info(struct kfd_dev *kfd)case IP_VERSION (6 ,0 ,1 ):case IP_VERSION (6 ,0 ,2 ):case IP_VERSION (6 ,0 ,3 ): +case IP_VERSION (6 ,1 ,0 ):/* Reserve 1 for paging and 1 for gfx */ kfd->device_info.num_reserved_sdma_queues_per_engine =2 ;/* BIT(0)=engine-0 queue-0; BIT(1)=engine-1 queue-0; BIT(2)=engine-0 queue-1; ... */
@@ -162,6 +164,7 @@ static void kfd_device_info_set_event_interrupt_class(struct kfd_dev *kfd)case IP_VERSION (11 ,0 ,2 ):case IP_VERSION (11 ,0 ,3 ):case IP_VERSION (11 ,0 ,4 ): +case IP_VERSION (11 ,5 ,0 ): kfd->device_info.event_interrupt_class = &event_interrupt_class_v11;break ;default :
@@ -413,6 +416,10 @@ struct kfd_dev *kgd2kfd_probe(struct amdgpu_device *adev, bool vf) gfx_target_version =110001 ; f2g = &gfx_v11_kfd2kgd;break ; +case IP_VERSION (11 ,5 ,0 ): + gfx_target_version =110500 ; + f2g = &gfx_v11_kfd2kgd; +break ;default :break ; }
Signature · 1 line
2.41.0
Alex Deucher
maintainerPATCH 6/9 drm/amdgpu: add imu firmware support for gc_11_5_0
In reply to Alex DeucherFrom: Aaron Liu <[email protected]>
Add imu firmware support for gc_11_5_0.
--- drivers/gpu/drm/amd/amdgpu/imu_v11_0.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/amd/amdgpu/imu_v11_0.c +1 -0
@@ -36,6 +36,7 @@ MODULE_FIRMWARE("amdgpu/gc_11_0_1_imu.bin");MODULE_FIRMWARE ("amdgpu/gc_11_0_2_imu.bin" );MODULE_FIRMWARE ("amdgpu/gc_11_0_3_imu.bin" );MODULE_FIRMWARE ("amdgpu/gc_11_0_4_imu.bin" ); +MODULE_FIRMWARE ("amdgpu/gc_11_5_0_imu.bin" );static int imu_v11_0_init_microcode (struct amdgpu_device *adev) {
Signature · 1 line
2.41.0
Alex Deucher
maintainerPATCH 7/9 drm/amdgpu: add mes firmware support for gc_11_5_0
In reply to Alex DeucherFrom: Aaron Liu <[email protected]>
Add scheduler and kiq firmware support for gc_11_5_0.
--- drivers/gpu/drm/amd/amdgpu/mes_v11_0.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/gpu/drm/amd/amdgpu/mes_v11_0.c +3 -0
@@ -47,6 +47,9 @@ MODULE_FIRMWARE("amdgpu/gc_11_0_3_mes1.bin");MODULE_FIRMWARE ("amdgpu/gc_11_0_4_mes.bin" );MODULE_FIRMWARE ("amdgpu/gc_11_0_4_mes_2.bin" );MODULE_FIRMWARE ("amdgpu/gc_11_0_4_mes1.bin" ); +MODULE_FIRMWARE ("amdgpu/gc_11_5_0_mes_2.bin" ); +MODULE_FIRMWARE ("amdgpu/gc_11_5_0_mes1.bin" ); +static int mes_v11_0_hw_fini (void *handle);static int mes_v11_0_kiq_hw_init (struct amdgpu_device *adev);
Signature · 1 line
2.41.0
Alex Deucher
maintainerPATCH 8/9 drm/amdgpu/discovery: enable mes block for gc 11.5.0
In reply to Alex DeucherFrom: Lang Yu <[email protected]>
Add to IP discovery table.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c +1 -0
@@ -2096,6 +2096,7 @@ static int amdgpu_discovery_set_mes_ip_blocks(struct amdgpu_device *adev)case IP_VERSION (11 ,0 ,2 ):case IP_VERSION (11 ,0 ,3 ):case IP_VERSION (11 ,0 ,4 ): +case IP_VERSION (11 ,5 ,0 ):amdgpu_device_ip_block_add (adev, &mes_v11_0_ip_block); adev->enable_mes = true; adev->enable_mes_kiq = true;
Signature · 1 line
2.41.0
Alex Deucher
maintainerPATCH 9/9 drm/amdgpu/discovery: enable gfx11 for GC 11.5.0
In reply to Alex DeucherFrom: Prike Liang <[email protected]>
Add to IP discovery table.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c +1 -0
@@ -1926,6 +1926,7 @@ static int amdgpu_discovery_set_gc_ip_blocks(struct amdgpu_device *adev)case IP_VERSION (11 ,0 ,2 ):case IP_VERSION (11 ,0 ,3 ):case IP_VERSION (11 ,0 ,4 ): +case IP_VERSION (11 ,5 ,0 ):amdgpu_device_ip_block_add (adev, &gfx_v11_0_ip_block);break ;default :
Signature · 1 line
2.41.0