drm/amdgpu: add support for GC IP version 11.5.3
PATCH 1/7 drm/amdgpu: add support for GC IP version 11.5.3
This initializes GC IP version 11.5.3.
Signed-off-by Tim Huang <[email protected]>
Reviewed-by Yifan Zhang <[email protected]>
--- drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 6 +++++ drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 1 + drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c | 12 +++++++++- drivers/gpu/drm/amd/amdgpu/gmc_v11_0.c | 2 ++ drivers/gpu/drm/amd/amdgpu/imu_v11_0.c | 1 + drivers/gpu/drm/amd/amdgpu/mes_v11_0.c | 2 ++ drivers/gpu/drm/amd/amdgpu/soc21.c | 22 +++++++++++++++++++ drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 1 + drivers/gpu/drm/amd/amdkfd/kfd_device.c | 5 +++++ 9 files changed, 51 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c +6 -0
@@ -1864,6 +1864,7 @@ static int amdgpu_discovery_set_common_ip_blocks(struct amdgpu_device *adev)case IP_VERSION (11 ,5 ,0 ):case IP_VERSION (11 ,5 ,1 ):case IP_VERSION (11 ,5 ,2 ): +case IP_VERSION (11 ,5 ,3 ):amdgpu_device_ip_block_add (adev, &soc21_common_ip_block);break ;case IP_VERSION (12 ,0 ,0 ):
@@ -1919,6 +1920,7 @@ static int amdgpu_discovery_set_gmc_ip_blocks(struct amdgpu_device *adev)case IP_VERSION (11 ,5 ,0 ):case IP_VERSION (11 ,5 ,1 ):case IP_VERSION (11 ,5 ,2 ): +case IP_VERSION (11 ,5 ,3 ):amdgpu_device_ip_block_add (adev, &gmc_v11_0_ip_block);break ;case IP_VERSION (12 ,0 ,0 ):
@@ -2215,6 +2217,7 @@ static int amdgpu_discovery_set_gc_ip_blocks(struct amdgpu_device *adev)case IP_VERSION (11 ,5 ,0 ):case IP_VERSION (11 ,5 ,1 ):case IP_VERSION (11 ,5 ,2 ): +case IP_VERSION (11 ,5 ,3 ):amdgpu_device_ip_block_add (adev, &gfx_v11_0_ip_block);break ;case IP_VERSION (12 ,0 ,0 ):
@@ -2393,6 +2396,7 @@ static int amdgpu_discovery_set_mes_ip_blocks(struct amdgpu_device *adev)case IP_VERSION (11 ,5 ,0 ):case IP_VERSION (11 ,5 ,1 ):case IP_VERSION (11 ,5 ,2 ): +case IP_VERSION (11 ,5 ,3 ):amdgpu_device_ip_block_add (adev, &mes_v11_0_ip_block); adev->enable_mes = true; adev->enable_mes_kiq = true;
@@ -2708,6 +2712,7 @@ int amdgpu_discovery_set_ip_blocks(struct amdgpu_device *adev)case IP_VERSION (11 ,5 ,0 ):case IP_VERSION (11 ,5 ,1 ):case IP_VERSION (11 ,5 ,2 ): +case IP_VERSION (11 ,5 ,3 ): adev->family =AMDGPU_FAMILY_GC_11_5_0 ;break ;case IP_VERSION (12 ,0 ,0 ):
@@ -2733,6 +2738,7 @@ int amdgpu_discovery_set_ip_blocks(struct amdgpu_device *adev)case IP_VERSION (11 ,5 ,0 ):case IP_VERSION (11 ,5 ,1 ):case IP_VERSION (11 ,5 ,2 ): +case IP_VERSION (11 ,5 ,3 ): adev->flags |=AMD_IS_APU ;break ;default :
drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c +1 -0
@@ -851,6 +851,7 @@ void amdgpu_gmc_tmz_set(struct amdgpu_device *adev)case IP_VERSION (11 ,5 ,0 ):case IP_VERSION (11 ,5 ,1 ):case IP_VERSION (11 ,5 ,2 ): +case IP_VERSION (11 ,5 ,3 ):/* Don't enable it by default yet. */ if (amdgpu_tmz <1 ) {
drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c +11 -1
@@ -100,6 +100,10 @@ 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" ); +MODULE_FIRMWARE ("amdgpu/gc_11_5_3_pfp.bin" ); +MODULE_FIRMWARE ("amdgpu/gc_11_5_3_me.bin" ); +MODULE_FIRMWARE ("amdgpu/gc_11_5_3_mec.bin" ); +MODULE_FIRMWARE ("amdgpu/gc_11_5_3_rlc.bin" );static const struct amdgpu_hwip_reg_entry gc_reg_list_11_0[] = {SOC15_REG_ENTRY_STR (GC ,0 , regGRBM_STATUS),
@@ -1096,6 +1100,7 @@ static int gfx_v11_0_gpu_early_init(struct amdgpu_device *adev)case IP_VERSION (11 ,5 ,0 ):case IP_VERSION (11 ,5 ,1 ):case IP_VERSION (11 ,5 ,2 ): +case IP_VERSION (11 ,5 ,3 ): 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 ;
@@ -1581,6 +1586,7 @@ static int gfx_v11_0_sw_init(struct amdgpu_ip_block *ip_block)case IP_VERSION (11 ,5 ,0 ):case IP_VERSION (11 ,5 ,1 ):case IP_VERSION (11 ,5 ,2 ): +case IP_VERSION (11 ,5 ,3 ): adev->gfx.me.num_me =1 ; adev->gfx.me.num_pipe_per_me =1 ; adev->gfx.me.num_queue_per_pipe =1 ;
@@ -2943,7 +2949,8 @@ static int gfx_v11_0_wait_for_rlc_autoload_complete(struct amdgpu_device *adev) 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, 2)) + amdgpu_ip_version(adev, GC_HWIP, 0) == IP_VERSION(11, 5, 2) || + amdgpu_ip_version(adev, GC_HWIP, 0) == IP_VERSION(11, 5, 3)) bootload_status =RREG32_SOC15 (GC ,0 , regRLC_RLCS_BOOTLOAD_STATUS_gc_11_0_1); else
@@ -5479,6 +5486,7 @@ static void gfx_v11_cntl_power_gating(struct amdgpu_device *adev, bool enable)case IP_VERSION (11 ,5 ,0 ):case IP_VERSION (11 ,5 ,1 ):case IP_VERSION (11 ,5 ,2 ): +case IP_VERSION (11 ,5 ,3 ):WREG32_SOC15 (GC ,0 , regRLC_PG_DELAY_3,RLC_PG_DELAY_3_DEFAULT_GC_11_0_1 );break ;default :
@@ -5516,6 +5524,7 @@ static int gfx_v11_0_set_powergating_state(struct amdgpu_ip_block *ip_block,case IP_VERSION (11 ,5 ,0 ):case IP_VERSION (11 ,5 ,1 ):case IP_VERSION (11 ,5 ,2 ): +case IP_VERSION (11 ,5 ,3 ):if (!enable)amdgpu_gfx_off_ctrl (adev, false);
@@ -5549,6 +5558,7 @@ static int gfx_v11_0_set_clockgating_state(struct amdgpu_ip_block *ip_block,case IP_VERSION (11 ,5 ,0 ):case IP_VERSION (11 ,5 ,1 ):case IP_VERSION (11 ,5 ,2 ): +case IP_VERSION (11 ,5 ,3 ):gfx_v11_0_update_gfx_clock_gating (adev, state ==AMD_CG_STATE_GATE );break ;
drivers/gpu/drm/amd/amdgpu/gmc_v11_0.c +2 -0
@@ -596,6 +596,7 @@ static void gmc_v11_0_set_gfxhub_funcs(struct amdgpu_device *adev)case IP_VERSION (11 ,5 ,0 ):case IP_VERSION (11 ,5 ,1 ):case IP_VERSION (11 ,5 ,2 ): +case IP_VERSION (11 ,5 ,3 ): adev->gfxhub.funcs = &gfxhub_v11_5_0_funcs;break ;default :
@@ -759,6 +760,7 @@ static int gmc_v11_0_sw_init(struct amdgpu_ip_block *ip_block)case IP_VERSION (11 ,5 ,0 ):case IP_VERSION (11 ,5 ,1 ):case IP_VERSION (11 ,5 ,2 ): +case IP_VERSION (11 ,5 ,3 ):set_bit (AMDGPU_GFXHUB (0 ), adev->vmhubs_mask);set_bit (AMDGPU_MMHUB0 (0 ), adev->vmhubs_mask);/*
drivers/gpu/drm/amd/amdgpu/imu_v11_0.c +1 -0
@@ -39,6 +39,7 @@ 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" ); +MODULE_FIRMWARE ("amdgpu/gc_11_5_3_imu.bin" );static int imu_v11_0_init_microcode (struct amdgpu_device *adev) {
drivers/gpu/drm/amd/amdgpu/mes_v11_0.c +2 -0
@@ -54,6 +54,8 @@ 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" ); +MODULE_FIRMWARE ("amdgpu/gc_11_5_3_mes_2.bin" ); +MODULE_FIRMWARE ("amdgpu/gc_11_5_3_mes1.bin" );static int mes_v11_0_hw_init (struct amdgpu_ip_block *ip_block);static int mes_v11_0_hw_fini (struct amdgpu_ip_block *ip_block);
drivers/gpu/drm/amd/amdgpu/soc21.c +22 -0
@@ -781,6 +781,28 @@ static int soc21_common_early_init(struct amdgpu_ip_block *ip_block)AMD_PG_SUPPORT_GFX_PG ; adev->external_rev_id = adev->rev_id +0x40 ;break ; +case IP_VERSION (11 ,5 ,3 ): + adev->cg_flags =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_GFX_PG ; + adev->external_rev_id = adev->rev_id +0x50 ; +break ;default :/* FIXME: not supported yet */ return -EINVAL ;
drivers/gpu/drm/amd/amdkfd/kfd_crat.c +1 -0
@@ -1704,6 +1704,7 @@ int kfd_get_gpu_cache_info(struct kfd_node *kdev, struct kfd_gpu_cache_info **pccase IP_VERSION (11 ,5 ,0 ):case IP_VERSION (11 ,5 ,1 ):case IP_VERSION (11 ,5 ,2 ): +case IP_VERSION (11 ,5 ,3 ):/* Cacheline size not available in IP discovery for gc11. * kfd_fill_gpu_cache_info_from_gfx_config to hard code it */
drivers/gpu/drm/amd/amdkfd/kfd_device.c +5 -0
@@ -180,6 +180,7 @@ static void kfd_device_info_set_event_interrupt_class(struct kfd_dev *kfd)case IP_VERSION (11 ,5 ,0 ):case IP_VERSION (11 ,5 ,1 ):case IP_VERSION (11 ,5 ,2 ): +case IP_VERSION (11 ,5 ,3 ): kfd->device_info.event_interrupt_class = &event_interrupt_class_v11;break ;case IP_VERSION (12 ,0 ,0 ):
@@ -454,6 +455,10 @@ struct kfd_dev *kgd2kfd_probe(struct amdgpu_device *adev, bool vf) gfx_target_version =110502 ; f2g = &gfx_v11_kfd2kgd;break ; +case IP_VERSION (11 ,5 ,3 ): + gfx_target_version =110503 ; + 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 2/7 drm/amdgpu: add support for SDMA IP version 6.1.3
This initializes SDMA IP version 6.1.3.
Signed-off-by Tim Huang <[email protected]>
Reviewed-by Yifan Zhang <[email protected]>
--- drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 1 + drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c | 1 + drivers/gpu/drm/amd/amdkfd/kfd_device.c | 2 ++ 3 files changed, 4 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c +1 -0
@@ -2273,6 +2273,7 @@ static int amdgpu_discovery_set_sdma_ip_blocks(struct amdgpu_device *adev)case IP_VERSION (6 ,1 ,0 ):case IP_VERSION (6 ,1 ,1 ):case IP_VERSION (6 ,1 ,2 ): +case IP_VERSION (6 ,1 ,3 ):amdgpu_device_ip_block_add (adev, &sdma_v6_0_ip_block);break ;case IP_VERSION (7 ,0 ,0 ):
drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c +1 -0
@@ -52,6 +52,7 @@ MODULE_FIRMWARE("amdgpu/sdma_6_0_3.bin");MODULE_FIRMWARE ("amdgpu/sdma_6_1_0.bin" );MODULE_FIRMWARE ("amdgpu/sdma_6_1_1.bin" );MODULE_FIRMWARE ("amdgpu/sdma_6_1_2.bin" ); +MODULE_FIRMWARE ("amdgpu/sdma_6_1_3.bin" );#define SDMA1_REG_OFFSET 0x600#define SDMA0_HYP_DEC_REG_START 0x5880
drivers/gpu/drm/amd/amdkfd/kfd_device.c +2 -0
@@ -101,6 +101,7 @@ static void kfd_device_info_set_sdma_info(struct kfd_dev *kfd)case IP_VERSION (6 ,1 ,0 ):case IP_VERSION (6 ,1 ,1 ):case IP_VERSION (6 ,1 ,2 ): +case IP_VERSION (6 ,1 ,3 ):case IP_VERSION (7 ,0 ,0 ):case IP_VERSION (7 ,0 ,1 ): kfd->device_info.num_sdma_queues_per_engine =8 ;
@@ -122,6 +123,7 @@ static void kfd_device_info_set_sdma_info(struct kfd_dev *kfd)case IP_VERSION (6 ,1 ,0 ):case IP_VERSION (6 ,1 ,1 ):case IP_VERSION (6 ,1 ,2 ): +case IP_VERSION (6 ,1 ,3 ):case IP_VERSION (7 ,0 ,0 ):case IP_VERSION (7 ,0 ,1 ):/* Reserve 1 for paging and 1 for gfx */
Signature · 1 line
2.43.0
PATCH 3/7 drm/amdgpu: add support for NBIO IP version 7.11.2
In reply to Tim HuangThis initializes NBIO IP version 7.11.2.
Signed-off-by Tim Huang <[email protected]>
Reviewed-by Yifan Zhang <[email protected]>
--- drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 1 + drivers/gpu/drm/amd/amdgpu/soc21.c | 1 + 2 files changed, 2 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c +1 -0
@@ -2778,6 +2778,7 @@ int amdgpu_discovery_set_ip_blocks(struct amdgpu_device *adev)break ;case IP_VERSION (7 ,11 ,0 ):case IP_VERSION (7 ,11 ,1 ): +case IP_VERSION (7 ,11 ,2 ):case IP_VERSION (7 ,11 ,3 ): adev->nbio.funcs = &nbio_v7_11_funcs; adev->nbio.hdp_flush_reg = &nbio_v7_11_hdp_flush_reg;
drivers/gpu/drm/amd/amdgpu/soc21.c +1 -0
@@ -962,6 +962,7 @@ static int soc21_common_set_clockgating_state(struct amdgpu_ip_block *ip_block,case IP_VERSION (7 ,7 ,1 ):case IP_VERSION (7 ,11 ,0 ):case IP_VERSION (7 ,11 ,1 ): +case IP_VERSION (7 ,11 ,2 ):case IP_VERSION (7 ,11 ,3 ): adev->nbio.funcs->update_medium_grain_clock_gating (adev, state ==AMD_CG_STATE_GATE );
Signature · 1 line
2.43.0
PATCH 4/7 drm/amdgpu: add support for MMHUB IP version 3.3.2
In reply to Tim HuangThis initializes MMHUB IP version 3.3.2.
Signed-off-by Tim Huang <[email protected]>
Reviewed-by Yifan Zhang <[email protected]>
--- drivers/gpu/drm/amd/amdgpu/gmc_v11_0.c | 1 + drivers/gpu/drm/amd/amdgpu/mmhub_v3_3.c | 1 + 2 files changed, 2 insertions(+)
drivers/gpu/drm/amd/amdgpu/gmc_v11_0.c +1 -0
@@ -579,6 +579,7 @@ static void gmc_v11_0_set_mmhub_funcs(struct amdgpu_device *adev)break ;case IP_VERSION (3 ,3 ,0 ):case IP_VERSION (3 ,3 ,1 ): +case IP_VERSION (3 ,3 ,2 ): adev->mmhub.funcs = &mmhub_v3_3_funcs;break ;default :
drivers/gpu/drm/amd/amdgpu/mmhub_v3_3.c +1 -0
@@ -103,6 +103,7 @@ mmhub_v3_3_print_l2_protection_fault_status(struct amdgpu_device *adev,switch (amdgpu_ip_version (adev,MMHUB_HWIP ,0 )) {case IP_VERSION (3 ,3 ,0 ):case IP_VERSION (3 ,3 ,1 ): +case IP_VERSION (3 ,3 ,2 ): mmhub_cid = cid <ARRAY_SIZE (mmhub_client_ids_v3_3) ? mmhub_client_ids_v3_3[cid][rw] : cid ==0x140 ?"UMSCH" :NULL ;
Signature · 1 line
2.43.0
PATCH 5/7 drm/amdgpu: enable VCN/JPEG CGPG for GC IP version 11.5.3
In reply to Tim HuangEnable VCN/JPEG CGPG for ASIC with GFX version 11.5.3.
Signed-off-by Saleemkhan Jamadar <[email protected]>
Signed-off-by Tim Huang <[email protected]>
Reviewed-by Yifan Zhang <[email protected]>
--- drivers/gpu/drm/amd/amdgpu/soc21.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/soc21.c +8 -2
@@ -782,7 +782,9 @@ static int soc21_common_early_init(struct amdgpu_ip_block *ip_block) adev->external_rev_id = adev->rev_id +0x40 ;break ;case IP_VERSION (11 ,5 ,3 ): - adev->cg_flags =AMD_CG_SUPPORT_GFX_CGCG | + 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 |
@@ -800,7 +802,11 @@ static int soc21_common_early_init(struct amdgpu_ip_block *ip_block)AMD_CG_SUPPORT_IH_CG |AMD_CG_SUPPORT_BIF_MGCG |AMD_CG_SUPPORT_BIF_LS ; - adev->pg_flags =AMD_PG_SUPPORT_GFX_PG ; + adev->pg_flags =AMD_PG_SUPPORT_VCN_DPG | +AMD_PG_SUPPORT_VCN | +AMD_PG_SUPPORT_JPEG_DPG | +AMD_PG_SUPPORT_JPEG | +AMD_PG_SUPPORT_GFX_PG ; adev->external_rev_id = adev->rev_id +0x50 ;break ;default :
Signature · 1 line
2.43.0
PATCH 6/7 drm/amdgpu: add support for SMU IP version 14.0.5
In reply to Tim HuangThis initializes SMU IP version 14.0.5.
Signed-off-by Tim Huang <[email protected]>
Reviewed-by Yifan Zhang <[email protected]>
--- drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 1 + drivers/gpu/drm/amd/amdgpu/soc21.c | 1 + drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 1 + drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0.c | 2 ++ 4 files changed, 5 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c +1 -0
@@ -2088,6 +2088,7 @@ static int amdgpu_discovery_set_smu_ip_blocks(struct amdgpu_device *adev)case IP_VERSION (14 ,0 ,2 ):case IP_VERSION (14 ,0 ,3 ):case IP_VERSION (14 ,0 ,4 ): +case IP_VERSION (14 ,0 ,5 ):amdgpu_device_ip_block_add (adev, &smu_v14_0_ip_block);break ;default :
drivers/gpu/drm/amd/amdgpu/soc21.c +1 -0
@@ -390,6 +390,7 @@ soc21_asic_reset_method(struct amdgpu_device *adev)case IP_VERSION (14 ,0 ,0 ):case IP_VERSION (14 ,0 ,1 ):case IP_VERSION (14 ,0 ,4 ): +case IP_VERSION (14 ,0 ,5 ):return AMD_RESET_METHOD_MODE2 ;default :if (amdgpu_dpm_is_baco_supported (adev))
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +1 -0
@@ -738,6 +738,7 @@ static int smu_set_funcs(struct amdgpu_device *adev)case IP_VERSION (14 ,0 ,0 ):case IP_VERSION (14 ,0 ,1 ):case IP_VERSION (14 ,0 ,4 ): +case IP_VERSION (14 ,0 ,5 ):smu_v14_0_0_set_ppt_funcs (smu);break ;case IP_VERSION (14 ,0 ,2 ):
drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0.c +2 -0
@@ -245,6 +245,7 @@ int smu_v14_0_check_fw_version(struct smu_context *smu)switch (amdgpu_ip_version (adev,MP1_HWIP ,0 )) {case IP_VERSION (14 ,0 ,0 ):case IP_VERSION (14 ,0 ,4 ): +case IP_VERSION (14 ,0 ,5 ): smu->smc_driver_if_version =SMU14_DRIVER_IF_VERSION_SMU_V14_0_0 ;break ;case IP_VERSION (14 ,0 ,1 ):
@@ -769,6 +770,7 @@ int smu_v14_0_gfx_off_control(struct smu_context *smu, bool enable)case IP_VERSION (14 ,0 ,2 ):case IP_VERSION (14 ,0 ,3 ):case IP_VERSION (14 ,0 ,4 ): +case IP_VERSION (14 ,0 ,5 ):if (!(adev->pm.pp_feature &PP_GFXOFF_MASK ))return 0 ;if (enable)
Signature · 1 line
2.43.0
PATCH 7/7 drm/amdgpu: add support for PSP IP version 14.0.5
In reply to Tim HuangThis initializes PSP IP version 14.0.5.
Signed-off-by Tim Huang <[email protected]>
Reviewed-by Yifan Zhang <[email protected]>
--- drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 4 ++++ drivers/gpu/drm/amd/amdgpu/psp_v14_0.c | 10 ++++++++++ 3 files changed, 15 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c +1 -0
@@ -2031,6 +2031,7 @@ static int amdgpu_discovery_set_psp_ip_blocks(struct amdgpu_device *adev)break ;case IP_VERSION (14 ,0 ,2 ):case IP_VERSION (14 ,0 ,3 ): +case IP_VERSION (14 ,0 ,5 ):amdgpu_device_ip_block_add (adev, &psp_v14_0_ip_block);break ;default :
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +4 -0
@@ -246,6 +246,10 @@ static int psp_early_init(struct amdgpu_ip_block *ip_block)case IP_VERSION (14 ,0 ,3 ):psp_v14_0_set_psp_funcs (psp);break ; +case IP_VERSION (14 ,0 ,5 ): +psp_v14_0_set_psp_funcs (psp); + psp->boot_time_tmr = false; +break ;default :return -EINVAL ; }
drivers/gpu/drm/amd/amdgpu/psp_v14_0.c +10 -0
@@ -35,6 +35,8 @@ MODULE_FIRMWARE("amdgpu/psp_14_0_2_sos.bin");MODULE_FIRMWARE ("amdgpu/psp_14_0_2_ta.bin" );MODULE_FIRMWARE ("amdgpu/psp_14_0_3_sos.bin" );MODULE_FIRMWARE ("amdgpu/psp_14_0_3_ta.bin" ); +MODULE_FIRMWARE ("amdgpu/psp_14_0_5_toc.bin" ); +MODULE_FIRMWARE ("amdgpu/psp_14_0_5_ta.bin" );/* For large FW files the time to complete can be very long */ #define USBC_PD_POLLING_LIMIT_S 240
@@ -72,6 +74,14 @@ static int psp_v14_0_init_microcode(struct psp_context *psp)if (err)return err;break ; +case IP_VERSION (14 ,0 ,5 ): + err =psp_init_toc_microcode (psp, ucode_prefix); +if (err) +return err; + err =psp_init_ta_microcode (psp, ucode_prefix); +if (err) +return err; +break ;default :BUG (); }
Signature · 1 line
2.43.0