drm/amdgpu: initialize GC IP v11.5.2
Subsystems (3)
PATCH 1/7 drm/amdgpu: initialize GC IP v11.5.2
Initialize GC 11.5.2 and set gfx hw configuration.
--- drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c +7 -1
@@ -1054,6 +1054,7 @@ static int gfx_v11_0_gpu_early_init(struct amdgpu_device *adev)case IP_VERSION (11 ,0 ,4 ):case IP_VERSION (11 ,5 ,0 ):case IP_VERSION (11 ,5 ,1 ): +case IP_VERSION (11 ,5 ,2 ): 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 ;
@@ -1534,6 +1535,7 @@ static int gfx_v11_0_sw_init(void *handle)case IP_VERSION (11 ,0 ,4 ):case IP_VERSION (11 ,5 ,0 ):case IP_VERSION (11 ,5 ,1 ): +case IP_VERSION (11 ,5 ,2 ): adev->gfx.me.num_me =1 ; adev->gfx.me.num_pipe_per_me =1 ; adev->gfx.me.num_queue_per_pipe =1 ;
@@ -2782,7 +2784,8 @@ static int gfx_v11_0_wait_for_rlc_autoload_complete(struct amdgpu_device *adev) amdgpu_ip_version(adev, GC_HWIP, 0) == IP_VERSION(11, 0, 4) || amdgpu_ip_version(adev, GC_HWIP, 0) == IP_VERSION(11, 5, 0) || - amdgpu_ip_version(adev, GC_HWIP, 0) == IP_VERSION(11, 5, 1)) + amdgpu_ip_version(adev, GC_HWIP, 0) == IP_VERSION(11, 5, 1) || + amdgpu_ip_version(adev, GC_HWIP, 0) == IP_VERSION(11, 5, 2)) bootload_status =RREG32_SOC15 (GC ,0 , regRLC_RLCS_BOOTLOAD_STATUS_gc_11_0_1); else
@@ -5296,6 +5299,7 @@ static void gfx_v11_cntl_power_gating(struct amdgpu_device *adev, bool enable)case IP_VERSION (11 ,0 ,4 ):case IP_VERSION (11 ,5 ,0 ):case IP_VERSION (11 ,5 ,1 ): +case IP_VERSION (11 ,5 ,2 ):WREG32_SOC15 (GC ,0 , regRLC_PG_DELAY_3,RLC_PG_DELAY_3_DEFAULT_GC_11_0_1 );break ;default :
@@ -5332,6 +5336,7 @@ static int gfx_v11_0_set_powergating_state(void *handle,case IP_VERSION (11 ,0 ,4 ):case IP_VERSION (11 ,5 ,0 ):case IP_VERSION (11 ,5 ,1 ): +case IP_VERSION (11 ,5 ,2 ):if (!enable)amdgpu_gfx_off_ctrl (adev, false);
@@ -5364,6 +5369,7 @@ static int gfx_v11_0_set_clockgating_state(void *handle,case IP_VERSION (11 ,0 ,4 ):case IP_VERSION (11 ,5 ,0 ):case IP_VERSION (11 ,5 ,1 ): +case IP_VERSION (11 ,5 ,2 ):gfx_v11_0_update_gfx_clock_gating (adev, state ==AMD_CG_STATE_GATE );break ;
Signature · 1 line
2.43.0
PATCH 2/7 drm/amdgpu: add GFXHUB IP v11.5.2 support
This patch is to add GFXHUB 11.5.2 support.
--- drivers/gpu/drm/amd/amdgpu/gmc_v11_0.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/gpu/drm/amd/amdgpu/gmc_v11_0.c +2 -0
@@ -592,6 +592,7 @@ static void gmc_v11_0_set_gfxhub_funcs(struct amdgpu_device *adev)break ;case IP_VERSION (11 ,5 ,0 ):case IP_VERSION (11 ,5 ,1 ): +case IP_VERSION (11 ,5 ,2 ): adev->gfxhub.funcs = &gfxhub_v11_5_0_funcs;break ;default :
@@ -754,6 +755,7 @@ static int gmc_v11_0_sw_init(void *handle)case IP_VERSION (11 ,0 ,4 ):case IP_VERSION (11 ,5 ,0 ):case IP_VERSION (11 ,5 ,1 ): +case IP_VERSION (11 ,5 ,2 ):set_bit (AMDGPU_GFXHUB (0 ), adev->vmhubs_mask);set_bit (AMDGPU_MMHUB0 (0 ), adev->vmhubs_mask);/*
Signature · 1 line
2.43.0
PATCH 3/7 drm/amdgpu: add tmz support for GC IP v11.5.2
In reply to Tim HuangAdd tmz support for GC 11.5.2.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c +1 -0
@@ -848,6 +848,7 @@ void amdgpu_gmc_tmz_set(struct amdgpu_device *adev)case IP_VERSION (11 ,0 ,4 ):case IP_VERSION (11 ,5 ,0 ):case IP_VERSION (11 ,5 ,1 ): +case IP_VERSION (11 ,5 ,2 ):/* Don't enable it by default yet. */ if (amdgpu_tmz <1 ) {
Signature · 1 line
2.43.0
PATCH 4/7 drm/amdgpu: add GC IP v11.5.2 soc21 support
In reply to Tim HuangAdd CG and PG flags for GFX IP v11.5.2 and
PG flags for VCN IP v4.0.5.
--- drivers/gpu/drm/amd/amdgpu/soc21.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+)
drivers/gpu/drm/amd/amdgpu/soc21.c +26 -0
@@ -752,6 +752,32 @@ static int soc21_common_early_init(void *handle)AMD_PG_SUPPORT_JPEG ; adev->external_rev_id = adev->rev_id +0xc1 ;break ; +case IP_VERSION (11 ,5 ,2 ): + adev->cg_flags =AMD_CG_SUPPORT_VCN_MGCG | +AMD_CG_SUPPORT_JPEG_MGCG | +AMD_CG_SUPPORT_GFX_CGCG | +AMD_CG_SUPPORT_GFX_CGLS | +AMD_CG_SUPPORT_GFX_MGCG | +AMD_CG_SUPPORT_GFX_FGCG | +AMD_CG_SUPPORT_REPEATER_FGCG | +AMD_CG_SUPPORT_GFX_PERF_CLK | +AMD_CG_SUPPORT_GFX_3D_CGCG | +AMD_CG_SUPPORT_GFX_3D_CGLS | +AMD_CG_SUPPORT_MC_MGCG | +AMD_CG_SUPPORT_MC_LS | +AMD_CG_SUPPORT_HDP_LS | +AMD_CG_SUPPORT_HDP_DS | +AMD_CG_SUPPORT_HDP_SD | +AMD_CG_SUPPORT_ATHUB_MGCG | +AMD_CG_SUPPORT_ATHUB_LS | +AMD_CG_SUPPORT_IH_CG | +AMD_CG_SUPPORT_BIF_MGCG | +AMD_CG_SUPPORT_BIF_LS ; + adev->pg_flags =AMD_PG_SUPPORT_VCN | +AMD_PG_SUPPORT_JPEG | +AMD_PG_SUPPORT_GFX_PG ; + adev->external_rev_id = adev->rev_id +0x40 ; +break ;default :/* FIXME: not supported yet */ return -EINVAL ;
Signature · 1 line
2.43.0
PATCH 5/7 drm/amdgpu: add GC IP v11.5.2 to GC 11.5.0 family
In reply to Tim HuangThis patch is to add GC 11.5.2 to GC 11.5.0 family.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c +6 -0
@@ -1808,6 +1808,7 @@ static int amdgpu_discovery_set_common_ip_blocks(struct amdgpu_device *adev)case IP_VERSION (11 ,0 ,4 ):case IP_VERSION (11 ,5 ,0 ):case IP_VERSION (11 ,5 ,1 ): +case IP_VERSION (11 ,5 ,2 ):amdgpu_device_ip_block_add (adev, &soc21_common_ip_block);break ;case IP_VERSION (12 ,0 ,0 ):
@@ -1861,6 +1862,7 @@ static int amdgpu_discovery_set_gmc_ip_blocks(struct amdgpu_device *adev)case IP_VERSION (11 ,0 ,4 ):case IP_VERSION (11 ,5 ,0 ):case IP_VERSION (11 ,5 ,1 ): +case IP_VERSION (11 ,5 ,2 ):amdgpu_device_ip_block_add (adev, &gmc_v11_0_ip_block);break ;case IP_VERSION (12 ,0 ,0 ):
@@ -2152,6 +2154,7 @@ static int amdgpu_discovery_set_gc_ip_blocks(struct amdgpu_device *adev)case IP_VERSION (11 ,0 ,4 ):case IP_VERSION (11 ,5 ,0 ):case IP_VERSION (11 ,5 ,1 ): +case IP_VERSION (11 ,5 ,2 ):amdgpu_device_ip_block_add (adev, &gfx_v11_0_ip_block);break ;case IP_VERSION (12 ,0 ,0 ):
@@ -2323,6 +2326,7 @@ static int amdgpu_discovery_set_mes_ip_blocks(struct amdgpu_device *adev)case IP_VERSION (11 ,0 ,4 ):case IP_VERSION (11 ,5 ,0 ):case IP_VERSION (11 ,5 ,1 ): +case IP_VERSION (11 ,5 ,2 ):amdgpu_device_ip_block_add (adev, &mes_v11_0_ip_block); adev->enable_mes = true; adev->enable_mes_kiq = true;
@@ -2632,6 +2636,7 @@ int amdgpu_discovery_set_ip_blocks(struct amdgpu_device *adev)break ;case IP_VERSION (11 ,5 ,0 ):case IP_VERSION (11 ,5 ,1 ): +case IP_VERSION (11 ,5 ,2 ): adev->family =AMDGPU_FAMILY_GC_11_5_0 ;break ;case IP_VERSION (12 ,0 ,0 ):
@@ -2656,6 +2661,7 @@ int amdgpu_discovery_set_ip_blocks(struct amdgpu_device *adev)case IP_VERSION (11 ,0 ,4 ):case IP_VERSION (11 ,5 ,0 ):case IP_VERSION (11 ,5 ,1 ): +case IP_VERSION (11 ,5 ,2 ): adev->flags |=AMD_IS_APU ;break ;default :
Signature · 1 line
2.43.0
PATCH 6/7 drm/amdkfd: add KFD support for GC IP v11.5.2
In reply to Tim HuangEnable KFD for GC 11.5.2.
--- drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 1 + drivers/gpu/drm/amd/amdkfd/kfd_device.c | 5 +++++ 2 files changed, 6 insertions(+)
drivers/gpu/drm/amd/amdkfd/kfd_crat.c +1 -0
@@ -1678,6 +1678,7 @@ int kfd_get_gpu_cache_info(struct kfd_node *kdev, struct kfd_gpu_cache_info **pccase IP_VERSION (11 ,0 ,4 ):case IP_VERSION (11 ,5 ,0 ):case IP_VERSION (11 ,5 ,1 ): +case IP_VERSION (11 ,5 ,2 ):case IP_VERSION (12 ,0 ,0 ):case IP_VERSION (12 ,0 ,1 ): num_of_cache_types =
drivers/gpu/drm/amd/amdkfd/kfd_device.c +5 -0
@@ -175,6 +175,7 @@ static void kfd_device_info_set_event_interrupt_class(struct kfd_dev *kfd)case IP_VERSION (11 ,0 ,4 ):case IP_VERSION (11 ,5 ,0 ):case IP_VERSION (11 ,5 ,1 ): +case IP_VERSION (11 ,5 ,2 ): kfd->device_info.event_interrupt_class = &event_interrupt_class_v11;break ;case IP_VERSION (12 ,0 ,0 ):
@@ -438,6 +439,10 @@ struct kfd_dev *kgd2kfd_probe(struct amdgpu_device *adev, bool vf) gfx_target_version =110501 ; f2g = &gfx_v11_kfd2kgd;break ; +case IP_VERSION (11 ,5 ,2 ): + gfx_target_version =110502 ; + f2g = &gfx_v11_kfd2kgd; +break ;case IP_VERSION (12 ,0 ,0 ): gfx_target_version =120000 ; f2g = &gfx_v12_kfd2kgd;
Signature · 1 line
2.43.0
PATCH 7/7 drm/amdgpu: add firmware for GC IP v11.5.2
In reply to Tim HuangThis patch is to add firmware for GC 11.5.2.
--- drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c | 4 ++++ drivers/gpu/drm/amd/amdgpu/imu_v11_0.c | 1 + drivers/gpu/drm/amd/amdgpu/mes_v11_0.c | 2 ++ 3 files changed, 7 insertions(+)
drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c +4 -0
@@ -93,6 +93,10 @@ MODULE_FIRMWARE("amdgpu/gc_11_5_1_pfp.bin");MODULE_FIRMWARE ("amdgpu/gc_11_5_1_me.bin" );MODULE_FIRMWARE ("amdgpu/gc_11_5_1_mec.bin" );MODULE_FIRMWARE ("amdgpu/gc_11_5_1_rlc.bin" ); +MODULE_FIRMWARE ("amdgpu/gc_11_5_2_pfp.bin" ); +MODULE_FIRMWARE ("amdgpu/gc_11_5_2_me.bin" ); +MODULE_FIRMWARE ("amdgpu/gc_11_5_2_mec.bin" ); +MODULE_FIRMWARE ("amdgpu/gc_11_5_2_rlc.bin" );static const struct amdgpu_hwip_reg_entry gc_reg_list_11_0[] = {SOC15_REG_ENTRY_STR (GC ,0 , regGRBM_STATUS),
drivers/gpu/drm/amd/amdgpu/imu_v11_0.c +1 -0
@@ -38,6 +38,7 @@ 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" );MODULE_FIRMWARE ("amdgpu/gc_11_5_1_imu.bin" ); +MODULE_FIRMWARE ("amdgpu/gc_11_5_2_imu.bin" );static int imu_v11_0_init_microcode (struct amdgpu_device *adev) {
drivers/gpu/drm/amd/amdgpu/mes_v11_0.c +2 -0
@@ -51,6 +51,8 @@ MODULE_FIRMWARE("amdgpu/gc_11_5_0_mes_2.bin");MODULE_FIRMWARE ("amdgpu/gc_11_5_0_mes1.bin" );MODULE_FIRMWARE ("amdgpu/gc_11_5_1_mes_2.bin" );MODULE_FIRMWARE ("amdgpu/gc_11_5_1_mes1.bin" ); +MODULE_FIRMWARE ("amdgpu/gc_11_5_2_mes_2.bin" ); +MODULE_FIRMWARE ("amdgpu/gc_11_5_2_mes1.bin" );static int mes_v11_0_hw_init (void *handle);static int mes_v11_0_hw_fini (void *handle);
Signature · 1 line
2.43.0
Re: [PATCH 7/7] drm/amdgpu: add firmware for GC IP v11.5.2
[Public]
Series is:
________________________________
From: Huang, Tim <[email protected]>
Sent: Sunday, June 30, 2024 10:38 AM
To: [email protected] <[email protected]>
Cc: Deucher, Alexander <[email protected]>; Zhang, Yifan <[email protected]>; Huang, Tim <[email protected]>; Zhang, Yifan <[email protected]>
Subject: [PATCH 7/7] drm/amdgpu: add firmware for GC IP v11.5.2
This patch is to add firmware for GC 11.5.2.
--- drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c | 4 ++++ drivers/gpu/drm/amd/amdgpu/imu_v11_0.c | 1 + drivers/gpu/drm/amd/amdgpu/mes_v11_0.c | 2 ++ 3 files changed, 7 insertions(+)
drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c +4 -0
@@ -93,6 +93,10 @@ MODULE_FIRMWARE("amdgpu/gc_11_5_1_pfp.bin");MODULE_FIRMWARE ("amdgpu/gc_11_5_1_me.bin" );MODULE_FIRMWARE ("amdgpu/gc_11_5_1_mec.bin" );MODULE_FIRMWARE ("amdgpu/gc_11_5_1_rlc.bin" ); +MODULE_FIRMWARE ("amdgpu/gc_11_5_2_pfp.bin" ); +MODULE_FIRMWARE ("amdgpu/gc_11_5_2_me.bin" ); +MODULE_FIRMWARE ("amdgpu/gc_11_5_2_mec.bin" ); +MODULE_FIRMWARE ("amdgpu/gc_11_5_2_rlc.bin" );static const struct amdgpu_hwip_reg_entry gc_reg_list_11_0[] = {SOC15_REG_ENTRY_STR (GC ,0 , regGRBM_STATUS),
drivers/gpu/drm/amd/amdgpu/imu_v11_0.c +1 -0
@@ -38,6 +38,7 @@ 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" );MODULE_FIRMWARE ("amdgpu/gc_11_5_1_imu.bin" ); +MODULE_FIRMWARE ("amdgpu/gc_11_5_2_imu.bin" );static int imu_v11_0_init_microcode (struct amdgpu_device *adev) {
drivers/gpu/drm/amd/amdgpu/mes_v11_0.c +2 -0
@@ -51,6 +51,8 @@ MODULE_FIRMWARE("amdgpu/gc_11_5_0_mes_2.bin");MODULE_FIRMWARE ("amdgpu/gc_11_5_0_mes1.bin" );MODULE_FIRMWARE ("amdgpu/gc_11_5_1_mes_2.bin" );MODULE_FIRMWARE ("amdgpu/gc_11_5_1_mes1.bin" ); +MODULE_FIRMWARE ("amdgpu/gc_11_5_2_mes_2.bin" ); +MODULE_FIRMWARE ("amdgpu/gc_11_5_2_mes1.bin" );static int mes_v11_0_hw_init (void *handle);static int mes_v11_0_hw_fini (void *handle);
--
2.43.0