drm/amdgpu: add UMC 8.11.0 support
Subsystems (3)
Alex Deucher
maintainerPATCH 1/1 drm/amdgpu: add UMC 8.11.0 support
From: Flora Cui <[email protected]>
Add initial support for UMC 8.11.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
@@ -591,6 +591,7 @@ static void gmc_v11_0_set_umc_funcs(struct amdgpu_device *adev) {switch (adev->ip_versions[UMC_HWIP ][0 ]) {case IP_VERSION (8 ,10 ,0 ): +case IP_VERSION (8 ,11 ,0 ):break ;default :break ;
Signature · 1 line
2.35.1
Alex Deucher
maintainerPATCH 1/1 drm/amdgpu: add GMC11 support for GC 11.0.2
From: Flora Cui <[email protected]>
Add initial support for GC 11.0.2.
--- 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
@@ -747,6 +747,7 @@ static int gmc_v11_0_sw_init(void *handle)switch (adev->ip_versions[GC_HWIP ][0 ]) {case IP_VERSION (11 ,0 ,0 ): +case IP_VERSION (11 ,0 ,2 ): adev->num_vmhubs =2 ;/* * To fulfill 4-level page support,
Signature · 1 line
2.35.1
Alex Deucher
maintainerPATCH 1/1 drm/amdgpu/discovery: add gmc11 support for GC 11.0.2
In reply to Alex DeucherFrom: Flora Cui <[email protected]>
Enable gmc11 support.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c +1 -0
@@ -1521,6 +1521,7 @@ static int amdgpu_discovery_set_gmc_ip_blocks(struct amdgpu_device *adev)amdgpu_device_ip_block_add (adev, &gmc_v10_0_ip_block);break ;case IP_VERSION (11 ,0 ,0 ): +case IP_VERSION (11 ,0 ,2 ):amdgpu_device_ip_block_add (adev, &gmc_v11_0_ip_block);break ;default :
Signature · 1 line
2.35.1
Alex Deucher
maintainerPATCH 1/1 drm/amdgpu: add VCN4_0_4 firmware
In reply to Alex DeucherFrom: James Zhu <[email protected]>
Add VCN4_0_4 firmware.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c +8 -0
@@ -54,6 +54,7 @@#define FIRMWARE_YELLOW_CARP "amdgpu/yellow_carp_vcn.bin"#define FIRMWARE_VCN_3_1_2 "amdgpu/vcn_3_1_2.bin"#define FIRMWARE_VCN4_0_0 "amdgpu/vcn_4_0_0.bin" +#define FIRMWARE_VCN4_0_4 "amdgpu/vcn_4_0_4.bin"MODULE_FIRMWARE (FIRMWARE_RAVEN );MODULE_FIRMWARE (FIRMWARE_PICASSO );
@@ -73,6 +74,7 @@ MODULE_FIRMWARE(FIRMWARE_BEIGE_GOBY);MODULE_FIRMWARE (FIRMWARE_YELLOW_CARP );MODULE_FIRMWARE (FIRMWARE_VCN_3_1_2 );MODULE_FIRMWARE (FIRMWARE_VCN4_0_0 ); +MODULE_FIRMWARE (FIRMWARE_VCN4_0_4 );static void amdgpu_vcn_idle_work_handler (struct work_struct *work);
@@ -183,6 +185,12 @@ int amdgpu_vcn_sw_init(struct amdgpu_device *adev) (adev->pg_flags & AMD_PG_SUPPORT_VCN_DPG)) adev->vcn.indirect_sram = true;break ; +case IP_VERSION (4 ,0 ,4 ): + fw_name =FIRMWARE_VCN4_0_4 ; +if ((adev->firmware.load_type ==AMDGPU_FW_LOAD_PSP ) && + (adev->pg_flags &AMD_PG_SUPPORT_VCN_DPG )) + adev->vcn.indirect_sram = false; +break ;default :return -EINVAL ; }
Signature · 1 line
2.35.1
Alex Deucher
maintainerPATCH 1/1 drm/amdgpu/psp13: add support for MP0 13.0.7
In reply to Alex DeucherFrom: Chengming Gui <[email protected]>
Enable support in psp code.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 2 ++ drivers/gpu/drm/amd/amdgpu/psp_v13_0.c | 2 ++ 2 files changed, 4 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +2 -0
@@ -84,6 +84,7 @@ static void psp_check_pmfw_centralized_cstate_management(struct psp_context *pspcase IP_VERSION (11 ,0 ,13 ):case IP_VERSION (13 ,0 ,0 ):case IP_VERSION (13 ,0 ,2 ): +case IP_VERSION (13 ,0 ,7 ): psp->pmfw_centralized_cstate_management = true;break ;default :
@@ -144,6 +145,7 @@ static int psp_early_init(void *handle) }break ;case IP_VERSION (13 ,0 ,0 ): +case IP_VERSION (13 ,0 ,7 ):psp_v13_0_set_psp_funcs (psp); psp->autoload_supported = true;break ;
drivers/gpu/drm/amd/amdgpu/psp_v13_0.c +2 -0
@@ -42,6 +42,7 @@ MODULE_FIRMWARE("amdgpu/psp_13_0_8_asd.bin");MODULE_FIRMWARE ("amdgpu/psp_13_0_8_toc.bin" );MODULE_FIRMWARE ("amdgpu/psp_13_0_8_ta.bin" );MODULE_FIRMWARE ("amdgpu/psp_13_0_0_sos.bin" ); +MODULE_FIRMWARE ("amdgpu/psp_13_0_7_sos.bin" );/* For large FW files the time to complete can be very long */ #define USBC_PD_POLLING_LIMIT_S 240
@@ -94,6 +95,7 @@ static int psp_v13_0_init_microcode(struct psp_context *psp)return err;break ;case IP_VERSION (13 ,0 ,0 ): +case IP_VERSION (13 ,0 ,7 ): err =psp_init_sos_microcode (psp, chip_name);if (err)return err;
Signature · 1 line
2.35.1
Alex Deucher
maintainerPATCH 1/1 drm/amdgpu/jpeg: enable JPEG CG for VCN4_0_4
In reply to Alex DeucherFrom: James Zhu <[email protected]>
Enable JPEG CG for VCN4_0_4.
--- drivers/gpu/drm/amd/amdgpu/soc21.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/soc21.c +2 -1
@@ -548,7 +548,8 @@ static int soc21_common_early_init(void *handle) adev->external_rev_id = adev->rev_id +0x1 ;// TODO: need update break ;case IP_VERSION (11 ,0 ,2 ): - adev->cg_flags =0 ; + adev->cg_flags = +AMD_CG_SUPPORT_JPEG_MGCG ; adev->pg_flags =0 ; adev->external_rev_id = adev->rev_id +0x10 ;break ;
Signature · 1 line
2.35.1
Alex Deucher
maintainerPATCH 1/1 drm/amdgpu/vcn: enable VCN CG for VCN4_0_4
In reply to Alex DeucherFrom: James Zhu <[email protected]>
Enable VCN CG for VCN4_0_4.
--- drivers/gpu/drm/amd/amdgpu/soc21.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/amd/amdgpu/soc21.c +1 -0
@@ -549,6 +549,7 @@ static int soc21_common_early_init(void *handle)break ;case IP_VERSION (11 ,0 ,2 ): adev->cg_flags = +AMD_CG_SUPPORT_VCN_MGCG |AMD_CG_SUPPORT_JPEG_MGCG ; adev->pg_flags =AMD_PG_SUPPORT_JPEG ;
Signature · 1 line
2.35.1
Alex Deucher
maintainerPATCH 1/1 drm/amdgpu/vcn: enable VCN PG for VCN4_0_4
In reply to Alex DeucherFrom: James Zhu <[email protected]>
Enable VCN PG for VCN4_0_4.
--- drivers/gpu/drm/amd/amdgpu/soc21.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/amd/amdgpu/soc21.c +1 -0
@@ -552,6 +552,7 @@ static int soc21_common_early_init(void *handle)AMD_CG_SUPPORT_VCN_MGCG |AMD_CG_SUPPORT_JPEG_MGCG ; adev->pg_flags = +AMD_PG_SUPPORT_VCN |AMD_PG_SUPPORT_JPEG ; adev->external_rev_id = adev->rev_id +0x10 ;break ;
Signature · 1 line
2.35.1
Alex Deucher
maintainerPATCH 1/1 drm/amdgpu/discovery: add psp13 support for PSP 13.0.7
In reply to Alex DeucherFrom: Chengming Gui <[email protected]>
Enable psp 13 support.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c +1 -0
@@ -1603,6 +1603,7 @@ static int amdgpu_discovery_set_psp_ip_blocks(struct amdgpu_device *adev)case IP_VERSION (13 ,0 ,2 ):case IP_VERSION (13 ,0 ,3 ):case IP_VERSION (13 ,0 ,5 ): +case IP_VERSION (13 ,0 ,7 ):case IP_VERSION (13 ,0 ,8 ):amdgpu_device_ip_block_add (adev, &psp_v13_0_ip_block);break ;
Signature · 1 line
2.35.1
Alex Deucher
maintainerPATCH 1/1 drm/amdgpu/vcn: enable VCN DPG mode for VCN4_0_4
In reply to Alex DeucherFrom: James Zhu <[email protected]>
Enable VCN DPG mode for VCN4_0_4.
--- drivers/gpu/drm/amd/amdgpu/soc21.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/amd/amdgpu/soc21.c +1 -0
@@ -553,6 +553,7 @@ static int soc21_common_early_init(void *handle)AMD_CG_SUPPORT_JPEG_MGCG ; adev->pg_flags =AMD_PG_SUPPORT_VCN | +AMD_PG_SUPPORT_VCN_DPG |AMD_PG_SUPPORT_JPEG ; adev->external_rev_id = adev->rev_id +0x10 ;break ;
Signature · 1 line
2.35.1
Alex Deucher
maintainerPATCH 1/1 drm/amdgpu: Enable vcn v4_0_4 sram
In reply to Alex DeucherFrom: Sonny Jiang <[email protected]>
enable vcn v4_0_4 sram
--- drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c +1 -1
@@ -189,7 +189,7 @@ int amdgpu_vcn_sw_init(struct amdgpu_device *adev) fw_name =FIRMWARE_VCN4_0_4 ;if ((adev->firmware.load_type ==AMDGPU_FW_LOAD_PSP ) && (adev->pg_flags &AMD_PG_SUPPORT_VCN_DPG )) - adev->vcn.indirect_sram = false; + adev->vcn.indirect_sram = true;break ;default :return -EINVAL ;
Signature · 1 line
2.35.1
Alex Deucher
maintainerPATCH 1/1 drm/amdgpu/jpeg: enable JPEG PG for VCN4_0_4
In reply to Alex DeucherFrom: James Zhu <[email protected]>
Enable JPEG PG for VCN4_0_4.
--- drivers/gpu/drm/amd/amdgpu/soc21.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/soc21.c +2 -1
@@ -550,7 +550,8 @@ static int soc21_common_early_init(void *handle)case IP_VERSION (11 ,0 ,2 ): adev->cg_flags =AMD_CG_SUPPORT_JPEG_MGCG ; - adev->pg_flags =0 ; + adev->pg_flags = +AMD_PG_SUPPORT_JPEG ; adev->external_rev_id = adev->rev_id +0x10 ;break ;default :
Signature · 1 line
2.35.1
Alex Deucher
maintainerPATCH 1/1 drm/amdgpu: add mes 11 firmware for mes 11.0.2
In reply to Alex DeucherFrom: Flora Cui <[email protected]>
Define firmware for MES 11.0.2.
--- drivers/gpu/drm/amd/amdgpu/mes_v11_0.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/gpu/drm/amd/amdgpu/mes_v11_0.c +2 -0
@@ -34,6 +34,8 @@MODULE_FIRMWARE ("amdgpu/gc_11_0_0_mes.bin" );MODULE_FIRMWARE ("amdgpu/gc_11_0_0_mes1.bin" ); +MODULE_FIRMWARE ("amdgpu/gc_11_0_2_mes.bin" ); +MODULE_FIRMWARE ("amdgpu/gc_11_0_2_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.35.1
Alex Deucher
maintainerPATCH 1/1 drm/amdkfd: add asic support for SDMA 6.0.2
In reply to Alex DeucherFrom: Eric Huang <[email protected]>
It is inherited from SDMA 6.0.0.
--- drivers/gpu/drm/amd/amdkfd/kfd_device.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/gpu/drm/amd/amdkfd/kfd_device.c +2 -0
@@ -87,6 +87,7 @@ static void kfd_device_info_set_sdma_info(struct kfd_dev *kfd)case IP_VERSION (5 ,2 ,4 ):/* DIMGREY_CAVEFISH */ case IP_VERSION (5 ,2 ,5 ):/* BEIGE_GOBY */ case IP_VERSION (6 ,0 ,0 ): +case IP_VERSION (6 ,0 ,2 ): kfd->device_info.num_sdma_queues_per_engine =8 ;break ;default :
@@ -98,6 +99,7 @@ static void kfd_device_info_set_sdma_info(struct kfd_dev *kfd)switch (sdma_version) {case IP_VERSION (6 ,0 ,0 ): +case IP_VERSION (6 ,0 ,2 ):/* 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; ... */
Signature · 1 line
2.35.1
Alex Deucher
maintainerPATCH 1/1 drm/amdgpu/discovery: enable vcn/jpeg v4_0_4
In reply to Alex DeucherFrom: James Zhu <[email protected]>
Enable vcn/jpeg 4_0_4.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c +1 -0
@@ -1861,6 +1861,7 @@ static int amdgpu_discovery_set_mm_ip_blocks(struct amdgpu_device *adev)amdgpu_device_ip_block_add (adev, &vcn_v3_0_ip_block);break ;case IP_VERSION (4 ,0 ,0 ): +case IP_VERSION (4 ,0 ,4 ):amdgpu_device_ip_block_add (adev, &vcn_v4_0_ip_block);amdgpu_device_ip_block_add (adev, &jpeg_v4_0_ip_block);break ;
Signature · 1 line
2.35.1
Alex Deucher
maintainerPATCH 1/1 drm/amdgpu/discovery: add mes11 support for GC 11.0.2
In reply to Alex DeucherFrom: Flora Cui <[email protected]>
Enable Micro Engine Scheduler support.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c +1 -0
@@ -1899,6 +1899,7 @@ static int amdgpu_discovery_set_mes_ip_blocks(struct amdgpu_device *adev) }break ;case IP_VERSION (11 ,0 ,0 ): +case IP_VERSION (11 ,0 ,2 ):amdgpu_device_ip_block_add (adev, &mes_v11_0_ip_block); adev->enable_mes = true; adev->enable_mes_kiq = true;
Signature · 1 line
2.35.1
Alex Deucher
maintainerPATCH 1/1 drm/amdkfd: add asic support for GC 11.0.2
In reply to Alex DeucherFrom: Eric Huang <[email protected]>
Changes are inherited from GC 11.0.0.
--- 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
@@ -1520,6 +1520,7 @@ static int kfd_fill_gpu_cache_info(struct kfd_dev *kdev, num_of_cache_types =ARRAY_SIZE (yellow_carp_cache_info);break ;case IP_VERSION (11 ,0 ,0 ): +case IP_VERSION (11 ,0 ,2 ): pcache_info = cache_info; num_of_cache_types =kfd_fill_gpu_cache_info_from_gfx_config (kdev, pcache_info);
drivers/gpu/drm/amd/amdkfd/kfd_device.c +5 -0
@@ -137,6 +137,7 @@ static void kfd_device_info_set_event_interrupt_class(struct kfd_dev *kfd) kfd->device_info.event_interrupt_class = &event_interrupt_class_v9;break ;case IP_VERSION (11 ,0 ,0 ): +case IP_VERSION (11 ,0 ,2 ): kfd->device_info.event_interrupt_class = &event_interrupt_class_v11;break ;default :
@@ -368,6 +369,10 @@ struct kfd_dev *kgd2kfd_probe(struct amdgpu_device *adev, bool vf) gfx_target_version =110000 ; f2g = &gfx_v11_kfd2kgd;break ; +case IP_VERSION (11 ,0 ,2 ): + gfx_target_version =110002 ; + f2g = &gfx_v11_kfd2kgd; +break ;default :break ; }
Signature · 1 line
2.35.1
Alex Deucher
maintainerPATCH 1/1 drm/amdgpu: add sdma 6.0.2 firware support
In reply to Alex DeucherFrom: Flora Cui <[email protected]>
define sdma 6.0.2 firmware.
--- drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c +1 -0
@@ -45,6 +45,7 @@#include "v11_structs.h" MODULE_FIRMWARE ("amdgpu/sdma_6_0_0.bin" ); +MODULE_FIRMWARE ("amdgpu/sdma_6_0_2.bin" );#define SDMA1_REG_OFFSET 0x600#define SDMA0_HYP_DEC_REG_START 0x5880
Signature · 1 line
2.35.1
Alex Deucher
maintainerPATCH 1/1 drm/amdgpu/discovery: add sdma6 support for SDMA 6.0.2
In reply to Alex DeucherFrom: Flora Cui <[email protected]>
Enable sdma6 support.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c +1 -0
@@ -1784,6 +1784,7 @@ static int amdgpu_discovery_set_sdma_ip_blocks(struct amdgpu_device *adev)amdgpu_device_ip_block_add (adev, &sdma_v5_2_ip_block);break ;case IP_VERSION (6 ,0 ,0 ): +case IP_VERSION (6 ,0 ,2 ):amdgpu_device_ip_block_add (adev, &sdma_v6_0_ip_block);break ;default :
Signature · 1 line
2.35.1
Alex Deucher
maintainerPATCH 1/1 drm/amdgpu: add gc v11_0_2 imu firmware
In reply to Alex DeucherFrom: Flora Cui <[email protected]>
add gc v11_0_2 imu firmware
--- 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
@@ -29,6 +29,7 @@#include "gc/gc_11_0_0_sh_mask.h" MODULE_FIRMWARE ("amdgpu/gc_11_0_0_imu.bin" ); +MODULE_FIRMWARE ("amdgpu/gc_11_0_2_imu.bin" );static int imu_v11_0_init_microcode (struct amdgpu_device *adev) {
Signature · 1 line
2.35.1
Alex Deucher
maintainerPATCH 1/1 drm/amdgpu: add initial GC 11.0.2 support
In reply to Alex DeucherFrom: Flora Cui <[email protected]>
Add initial support for GC 11.0.2 to gfx_v11_0.c.
--- drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c +6 -0
@@ -59,6 +59,10 @@ MODULE_FIRMWARE("amdgpu/gc_11_0_0_me.bin");MODULE_FIRMWARE ("amdgpu/gc_11_0_0_mec.bin" );MODULE_FIRMWARE ("amdgpu/gc_11_0_0_rlc.bin" );MODULE_FIRMWARE ("amdgpu/gc_11_0_0_toc.bin" ); +MODULE_FIRMWARE ("amdgpu/gc_11_0_2_pfp.bin" ); +MODULE_FIRMWARE ("amdgpu/gc_11_0_2_me.bin" ); +MODULE_FIRMWARE ("amdgpu/gc_11_0_2_mec.bin" ); +MODULE_FIRMWARE ("amdgpu/gc_11_0_2_rlc.bin" );static const struct soc15_reg_golden golden_settings_gc_11_0[] = {
@@ -1122,6 +1126,7 @@ static int gfx_v11_0_gpu_early_init(struct amdgpu_device *adev)switch (adev->ip_versions[GC_HWIP ][0 ]) {case IP_VERSION (11 ,0 ,0 ): +case IP_VERSION (11 ,0 ,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 ;
@@ -1548,6 +1553,7 @@ static int gfx_v11_0_sw_init(void *handle)switch (adev->ip_versions[GC_HWIP ][0 ]) {case IP_VERSION (11 ,0 ,0 ): +case IP_VERSION (11 ,0 ,2 ): adev->gfx.me.num_me =1 ; adev->gfx.me.num_pipe_per_me =1 ; adev->gfx.me.num_queue_per_pipe =1 ;
Signature · 1 line
2.35.1
Alex Deucher
maintainerPATCH 1/1 drm/amdgpu: update rlc ram for gc v11_0_2
In reply to Alex DeucherFrom: Likun Gao <[email protected]>
Add imu rlc ram register settings for gc v11_0_2
--- drivers/gpu/drm/amd/amdgpu/imu_v11_0.c | 85 +++++++++++++++++++++++++- 1 file changed, 82 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/amdgpu/imu_v11_0.c +82 -3
@@ -229,6 +229,75 @@ static const struct imu_rlc_ram_golden imu_rlc_ram_golden_11[] =IMU_RLC_RAM_GOLDEN_VALUE (GC ,0 , regCPG_PSP_DEBUG,CPG_PSP_DEBUG__GPA_OVERRIDE_MASK ,0 ) }; +static const struct imu_rlc_ram_golden imu_rlc_ram_golden_11_0_2[] = +{ +IMU_RLC_RAM_GOLDEN_VALUE (GC ,0 , regGCEA_MISC,0x0c48bff0 ,0xe0000000 ), +IMU_RLC_RAM_GOLDEN_VALUE (GC ,0 , regGCEA_SDP_CREDITS,0x003f3fbf ,0xe0000000 ), +IMU_RLC_RAM_GOLDEN_VALUE (GC ,0 , regGCEA_SDP_TAG_RESERVE0,0x10200800 ,0xe0000000 ), +IMU_RLC_RAM_GOLDEN_VALUE (GC ,0 , regGCEA_SDP_TAG_RESERVE1,0x00000088 ,0xe0000000 ), +IMU_RLC_RAM_GOLDEN_VALUE (GC ,0 , regGCEA_SDP_VCC_RESERVE0,0x1d041040 ,0xe0000000 ), +IMU_RLC_RAM_GOLDEN_VALUE (GC ,0 , regGCEA_SDP_VCC_RESERVE1,0x80000000 ,0xe0000000 ), +IMU_RLC_RAM_GOLDEN_VALUE (GC ,0 , regGCEA_SDP_IO_PRIORITY,0x88888888 ,0xe0000000 ), +IMU_RLC_RAM_GOLDEN_VALUE (GC ,0 , regGCEA_MAM_CTRL,0x0000d800 ,0xe0000000 ), +IMU_RLC_RAM_GOLDEN_VALUE (GC ,0 , regGCEA_SDP_ARB_FINAL,0x000007ef ,0xe0000000 ), +IMU_RLC_RAM_GOLDEN_VALUE (GC ,0 , regGCEA_DRAM_PAGE_BURST,0x20080200 ,0xe0000000 ), +IMU_RLC_RAM_GOLDEN_VALUE (GC ,0 , regGCEA_SDP_ENABLE,0x00000001 ,0xe0000000 ), +IMU_RLC_RAM_GOLDEN_VALUE (GC ,0 , regGCMC_VM_APT_CNTL,0x0000000c ,0xe0000000 ), +IMU_RLC_RAM_GOLDEN_VALUE (GC ,0 , regGCMC_VM_CACHEABLE_DRAM_ADDRESS_END,0x000fffff ,0xe0000000 ), +IMU_RLC_RAM_GOLDEN_VALUE (GC ,0 , regGUS_IO_RD_COMBINE_FLUSH,0x00055555 ,0xe0000000 ), +IMU_RLC_RAM_GOLDEN_VALUE (GC ,0 , regGUS_IO_WR_COMBINE_FLUSH,0x00055555 ,0xe0000000 ), +IMU_RLC_RAM_GOLDEN_VALUE (GC ,0 , regGUS_DRAM_COMBINE_FLUSH,0x00555555 ,0xe0000000 ), +IMU_RLC_RAM_GOLDEN_VALUE (GC ,0 , regGUS_MISC2,0x00001ffe ,0xe0000000 ), +IMU_RLC_RAM_GOLDEN_VALUE (GC ,0 , regGUS_SDP_CREDITS,0x003f3fff ,0xe0000000 ), +IMU_RLC_RAM_GOLDEN_VALUE (GC ,0 , regGUS_SDP_TAG_RESERVE1,0x00000000 ,0xe0000000 ), +IMU_RLC_RAM_GOLDEN_VALUE (GC ,0 , regGUS_SDP_VCC_RESERVE0,0x00041000 ,0xe0000000 ), +IMU_RLC_RAM_GOLDEN_VALUE (GC ,0 , regGUS_SDP_VCC_RESERVE1,0x00000000 ,0xe0000000 ), +IMU_RLC_RAM_GOLDEN_VALUE (GC ,0 , regGUS_SDP_VCD_RESERVE0,0x00040000 ,0xe0000000 ), +IMU_RLC_RAM_GOLDEN_VALUE (GC ,0 , regGUS_SDP_VCD_RESERVE1,0x00000000 ,0xe0000000 ), +IMU_RLC_RAM_GOLDEN_VALUE (GC ,0 , regGUS_MISC,0x00000017 ,0xe0000000 ), +IMU_RLC_RAM_GOLDEN_VALUE (GC ,0 , regGUS_SDP_ENABLE,0x00000001 ,0xe0000000 ), +IMU_RLC_RAM_GOLDEN_VALUE (GC ,0 , regCC_GC_SA_UNIT_DISABLE,0x00fffc01 ,0xe0000000 ), +IMU_RLC_RAM_GOLDEN_VALUE (GC ,0 , regCC_GC_PRIM_CONFIG,0x000fffe1 ,0xe0000000 ), +IMU_RLC_RAM_GOLDEN_VALUE (GC ,0 , regCC_RB_BACKEND_DISABLE,0x00000f01 ,0xe0000000 ), +IMU_RLC_RAM_GOLDEN_VALUE (GC ,0 , regCC_GC_SHADER_ARRAY_CONFIG,0xfffe0001 ,0xe0000000 ), +IMU_RLC_RAM_GOLDEN_VALUE (GC ,0 , regGL1_PIPE_STEER,0x000000e4 ,0xe0000000 ), +IMU_RLC_RAM_GOLDEN_VALUE (GC ,0 , regCH_PIPE_STEER,0x000000e4 ,0xe0000000 ), +IMU_RLC_RAM_GOLDEN_VALUE (GC ,0 , regGL2_PIPE_STEER_0,0x01231023 ,0xe0000000 ), +IMU_RLC_RAM_GOLDEN_VALUE (GC ,0 , regGB_ADDR_CONFIG,0x00000243 ,0xe0000000 ), +IMU_RLC_RAM_GOLDEN_VALUE (GC ,0 , regGCUTCL2_HARVEST_BYPASS_GROUPS,0x00000002 ,0xe0000000 ), +IMU_RLC_RAM_GOLDEN_VALUE (GC ,0 , regGCMC_VM_MX_L1_TLB_CNTL,0x00000500 ,0xe0000000 ), +IMU_RLC_RAM_GOLDEN_VALUE (GC ,0 , regGCMC_VM_SYSTEM_APERTURE_LOW_ADDR,0x00000001 ,0xe0000000 ), +IMU_RLC_RAM_GOLDEN_VALUE (GC ,0 , regGCMC_VM_SYSTEM_APERTURE_HIGH_ADDR,0x00000000 ,0xe0000000 ), +IMU_RLC_RAM_GOLDEN_VALUE (GC ,0 , regGCMC_VM_LOCAL_FB_ADDRESS_START,0x00000000 ,0xe0000000 ), +IMU_RLC_RAM_GOLDEN_VALUE (GC ,0 , regGCMC_VM_LOCAL_FB_ADDRESS_END,0x000001ff ,0xe0000000 ), +IMU_RLC_RAM_GOLDEN_VALUE (GC ,0 , regGCMC_VM_FB_LOCATION_BASE,0x00006000 ,0xe0000000 ), +IMU_RLC_RAM_GOLDEN_VALUE (GC ,0 , regGCMC_VM_FB_LOCATION_TOP,0x000061ff ,0xe0000000 ), +IMU_RLC_RAM_GOLDEN_VALUE (GC ,0 , regGCVM_CONTEXT0_CNTL,0x00000000 ,0xe0000000 ), +IMU_RLC_RAM_GOLDEN_VALUE (GC ,0 , regGCVM_CONTEXT1_CNTL,0x00000000 ,0xe0000000 ), +IMU_RLC_RAM_GOLDEN_VALUE (GC ,0 , regGCMC_VM_APT_CNTL,0x0000000c ,0xe0000000 ), +IMU_RLC_RAM_GOLDEN_VALUE (GC ,0 , regGCMC_VM_NB_TOP_OF_DRAM_SLOT1,0xff800000 ,0xe0000000 ), +IMU_RLC_RAM_GOLDEN_VALUE (GC ,0 , regGCMC_VM_NB_LOWER_TOP_OF_DRAM2,0x00000001 ,0xe0000000 ), +IMU_RLC_RAM_GOLDEN_VALUE (GC ,0 , regGCMC_VM_NB_UPPER_TOP_OF_DRAM2,0x00000fff ,0xe0000000 ), +IMU_RLC_RAM_GOLDEN_VALUE (GC ,0 , regGCMC_VM_AGP_BASE,0x00000000 ,0xe0000000 ), +IMU_RLC_RAM_GOLDEN_VALUE (GC ,0 , regGCMC_VM_AGP_BOT,0x00000002 ,0xe0000000 ), +IMU_RLC_RAM_GOLDEN_VALUE (GC ,0 , regGCMC_VM_AGP_TOP,0x00000000 ,0xe0000000 ), +IMU_RLC_RAM_GOLDEN_VALUE (GC ,0 , regGCVM_L2_PROTECTION_FAULT_CNTL,0x00001ffc ,0xe0000000 ), +IMU_RLC_RAM_GOLDEN_VALUE (GC ,0 , regGCVM_L2_PROTECTION_FAULT_CNTL2,0x00002825 ,0xe0000000 ), +IMU_RLC_RAM_GOLDEN_VALUE (GC ,0 , regGCMC_VM_MX_L1_TLB_CNTL,0x00000501 ,0xe0000000 ), +IMU_RLC_RAM_GOLDEN_VALUE (GC ,0 , regGCVM_L2_CNTL,0x00080603 ,0xe0000000 ), +IMU_RLC_RAM_GOLDEN_VALUE (GC ,0 , regGCVM_L2_CNTL2,0x00000003 ,0xe0000000 ), +IMU_RLC_RAM_GOLDEN_VALUE (GC ,0 , regGCVM_L2_CNTL3,0x00100003 ,0xe0000000 ), +IMU_RLC_RAM_GOLDEN_VALUE (GC ,0 , regGCVM_L2_CNTL5,0x00003fe0 ,0xe0000000 ), +IMU_RLC_RAM_GOLDEN_VALUE (GC ,0 , regGCVM_CONTEXT0_CNTL,0x00000001 ,0xe0000000 ), +IMU_RLC_RAM_GOLDEN_VALUE (GC ,0 , regGCVM_L2_CONTEXT0_PER_PFVF_PTE_CACHE_FRAGMENT_SIZES,0x00000c00 ,0xe0000000 ), +IMU_RLC_RAM_GOLDEN_VALUE (GC ,0 , regGCVM_CONTEXT1_CNTL,0x00000001 ,0xe0000000 ), +IMU_RLC_RAM_GOLDEN_VALUE (GC ,0 , regGCVM_L2_CONTEXT1_PER_PFVF_PTE_CACHE_FRAGMENT_SIZES,0x00000c00 ,0xe0000000 ), +IMU_RLC_RAM_GOLDEN_VALUE (GC ,0 , regSDMA0_UCODE_SELFLOAD_CONTROL,0x00000210 ,0 ), +IMU_RLC_RAM_GOLDEN_VALUE (GC ,0 , regSDMA1_UCODE_SELFLOAD_CONTROL,0x00000210 ,0 ), +IMU_RLC_RAM_GOLDEN_VALUE (GC ,0 , regCPC_PSP_DEBUG,CPC_PSP_DEBUG__GPA_OVERRIDE_MASK ,0 ), +IMU_RLC_RAM_GOLDEN_VALUE (GC ,0 , regCPG_PSP_DEBUG,CPG_PSP_DEBUG__GPA_OVERRIDE_MASK ,0 ) +}; +void program_imu_rlc_ram (struct amdgpu_device *adev,const struct imu_rlc_ram_golden *regs,const u32 array_size)
@@ -268,9 +337,19 @@ static void imu_v11_0_program_rlc_ram(struct amdgpu_device *adev)WREG32_SOC15 (GC ,0 , regGFX_IMU_RLC_RAM_INDEX,0x2 ); -program_imu_rlc_ram (adev, - imu_rlc_ram_golden_11, - (const u32 )ARRAY_SIZE (imu_rlc_ram_golden_11)); +switch (adev->ip_versions[GC_HWIP ][0 ]) { +case IP_VERSION (11 ,0 ,0 ): +program_imu_rlc_ram (adev, imu_rlc_ram_golden_11, + (const u32 )ARRAY_SIZE (imu_rlc_ram_golden_11)); +break ; +case IP_VERSION (11 ,0 ,2 ): +program_imu_rlc_ram (adev, imu_rlc_ram_golden_11_0_2, + (const u32 )ARRAY_SIZE (imu_rlc_ram_golden_11_0_2)); +break ; +default : +BUG (); +break ; + }//Indicate the contents of the RAM are valid reg_data =RREG32_SOC15 (GC ,0 , regGFX_IMU_RLC_RAM_INDEX);
Signature · 1 line
2.35.1
Alex Deucher
maintainerPATCH 1/1 drm/amdgpu: enable cgcg and cgls for GC 11_0_2
In reply to Alex DeucherFrom: Likun Gao <[email protected]>
Enable GFX CGCG and CGLS for GFX v11_0_2.
--- drivers/gpu/drm/amd/amdgpu/soc21.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/gpu/drm/amd/amdgpu/soc21.c +2 -0
@@ -549,6 +549,8 @@ static int soc21_common_early_init(void *handle)break ;case IP_VERSION (11 ,0 ,2 ): adev->cg_flags = +AMD_CG_SUPPORT_GFX_CGCG | +AMD_CG_SUPPORT_GFX_CGLS |AMD_CG_SUPPORT_VCN_MGCG |AMD_CG_SUPPORT_JPEG_MGCG ; adev->pg_flags =
Signature · 1 line
2.35.1
Alex Deucher
maintainerPATCH 1/1 drm/amdgpu/discovery: add gfx11 support for GC 11.0.2
In reply to Alex DeucherFrom: Flora Cui <[email protected]>
Enable gfx11 support.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c +1 -0
@@ -1743,6 +1743,7 @@ static int amdgpu_discovery_set_gc_ip_blocks(struct amdgpu_device *adev)amdgpu_device_ip_block_add (adev, &gfx_v10_0_ip_block);break ;case IP_VERSION (11 ,0 ,0 ): +case IP_VERSION (11 ,0 ,2 ):amdgpu_device_ip_block_add (adev, &gfx_v11_0_ip_block);break ;default :
Signature · 1 line
2.35.1
Alex Deucher
maintainerPATCH 1/1 drm/amdgpu/discovery: set family for GC 11.0.2
In reply to Alex DeucherFrom: Flora Cui <[email protected]>
Set AMDGPU_FAMILY_GC_11_0_0.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c +1 -0
@@ -2125,6 +2125,7 @@ int amdgpu_discovery_set_ip_blocks(struct amdgpu_device *adev) adev->family =AMDGPU_FAMILY_GC_10_3_7 ;break ;case IP_VERSION (11 ,0 ,0 ): +case IP_VERSION (11 ,0 ,2 ): adev->family =AMDGPU_FAMILY_GC_11_0_0 ;break ;default :
Signature · 1 line
2.35.1