drm/amdgpu: add mmhub support for MMHUB 3.0.1
Subsystems (4)
Alex Deucher
maintainerPATCH 1/1 drm/amdgpu: add mmhub support for MMHUB 3.0.1
From: Huang Rui <[email protected]>
Add the mmhub support for MMHUB 3.0.1.
--- drivers/gpu/drm/amd/amdgpu/mmhub_v3_0.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/amd/amdgpu/mmhub_v3_0.c +1 -0
@@ -109,6 +109,7 @@ mmhub_v3_0_print_l2_protection_fault_status(struct amdgpu_device *adev, status);switch (adev->ip_versions[MMHUB_HWIP ][0 ]) {case IP_VERSION (3 ,0 ,0 ): +case IP_VERSION (3 ,0 ,1 ): mmhub_cid = mmhub_client_ids_v3_0_0[cid][rw];break ;default :
Signature · 1 line
2.35.1
Alex Deucher
maintainerPATCH 1/1 drm/amdgpu/discovery: enable soc21 common for GC 11.0.1
From: Huang Rui <[email protected]>
Enable soc21 common for GC 11.0.1.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c +1 -0
@@ -1481,6 +1481,7 @@ static int amdgpu_discovery_set_common_ip_blocks(struct amdgpu_device *adev)amdgpu_device_ip_block_add (adev, &nv_common_ip_block);break ;case IP_VERSION (11 ,0 ,0 ): +case IP_VERSION (11 ,0 ,1 ):case IP_VERSION (11 ,0 ,2 ):amdgpu_device_ip_block_add (adev, &soc21_common_ip_block);break ;
Signature · 1 line
2.35.1
Alex Deucher
maintainerPATCH 1/1 drm/amdgpu: add gmc v11 support for GC 11.0.1
In reply to Alex DeucherFrom: Huang Rui <[email protected]>
Add gmc v11 support for GC 11.0.1.
--- 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 ,1 ):case IP_VERSION (11 ,0 ,2 ): adev->num_vmhubs =2 ;/*
Signature · 1 line
2.35.1
Alex Deucher
maintainerPATCH 1/1 drm/amdgpu/discovery: enable gmc v11 for GC 11.0.1
In reply to Alex DeucherFrom: Huang Rui <[email protected]>
Enable gmc (graphic memory controller) v11 for GC 11.0.1.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c +1 -0
@@ -1524,6 +1524,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 ,1 ):case IP_VERSION (11 ,0 ,2 ):amdgpu_device_ip_block_add (adev, &gmc_v11_0_ip_block);break ;
Signature · 1 line
2.35.1
Alex Deucher
maintainerPATCH 1/1 drm/amdgpu/discovery: add PSP v13.0.4 into the IP discovery list
In reply to Alex DeucherFrom: Xiaojian Du <[email protected]>
This patch will add PSP v13.0.4 into the IP discovery list.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c +1 -0
@@ -1607,6 +1607,7 @@ static int amdgpu_discovery_set_psp_ip_blocks(struct amdgpu_device *adev)case IP_VERSION (13 ,0 ,1 ):case IP_VERSION (13 ,0 ,2 ):case IP_VERSION (13 ,0 ,3 ): +case IP_VERSION (13 ,0 ,4 ):case IP_VERSION (13 ,0 ,5 ):case IP_VERSION (13 ,0 ,7 ):case IP_VERSION (13 ,0 ,8 ):
Signature · 1 line
2.35.1
Alex Deucher
maintainerPATCH 1/1 drm/amdgpu/discovery: enable sdma v6 for SDMA 6.0.1
In reply to Alex DeucherFrom: Huang Rui <[email protected]>
Enable sdma (system dma) v6 for SDMA 6.0.1.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c +1 -0
@@ -1791,6 +1791,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 ,1 ):case IP_VERSION (6 ,0 ,2 ):amdgpu_device_ip_block_add (adev, &sdma_v6_0_ip_block);break ;
Signature · 1 line
2.35.1
Alex Deucher
maintainerPATCH 1/1 drm/amdgpu: add GC 11.0.1 family id
In reply to Alex DeucherFrom: Huang Rui <[email protected]>
Add a flag to define GC 11.0.1.
--- include/uapi/drm/amdgpu_drm.h | 1 + 1 file changed, 1 insertion(+)
include/uapi/drm/amdgpu_drm.h +1 -0
@@ -1152,6 +1152,7 @@ struct drm_amdgpu_info_video_caps {#define AMDGPU_FAMILY_VGH 144/* Van Gogh */ #define AMDGPU_FAMILY_GC_11_0_0 145/* GC 11.0.0 */ #define AMDGPU_FAMILY_YC 146/* Yellow Carp */ +#define AMDGPU_FAMILY_GC_11_0_1 148/* GC 11.0.1 */ #define AMDGPU_FAMILY_GC_10_3_6 149/* GC 10.3.6 */ #define AMDGPU_FAMILY_GC_10_3_7 151/* GC 10.3.7 */
Signature · 1 line
2.35.1
Alex Deucher
maintainerPATCH 1/1 drm/amdgpu: set GC 11.0.1 family
In reply to Alex DeucherFrom: Huang Rui <[email protected]>
Add GC 11.0.1 family support.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c +3 -0
@@ -2135,6 +2135,9 @@ int amdgpu_discovery_set_ip_blocks(struct amdgpu_device *adev)case IP_VERSION (11 ,0 ,2 ): adev->family =AMDGPU_FAMILY_GC_11_0_0 ;break ; +case IP_VERSION (11 ,0 ,1 ): + adev->family =AMDGPU_FAMILY_GC_11_0_1 ; +break ;default :return -EINVAL ; }
Signature · 1 line
2.35.1
Alex Deucher
maintainerPATCH 1/1 drm/amdgpu: add sdma support for sdma 6.0.1
In reply to Alex DeucherFrom: Huang Rui <[email protected]>
Add sdma 6.0.1 support to sdma6 implementation.
--- 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_1.bin" );MODULE_FIRMWARE ("amdgpu/sdma_6_0_2.bin" );#define SDMA1_REG_OFFSET 0x600
Signature · 1 line
2.35.1
Alex Deucher
maintainerPATCH 1/1 drm/amdgpu: add soc21 common ip block support for GC 11.0.1
In reply to Alex DeucherFrom: Huang Rui <[email protected]>
Add common soc21 ip block support for GC 11.0.1.
--- drivers/gpu/drm/amd/amdgpu/soc21.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/gpu/drm/amd/amdgpu/soc21.c +5 -0
@@ -564,6 +564,11 @@ static int soc21_common_early_init(void *handle)AMD_PG_SUPPORT_MMHUB ; adev->external_rev_id = adev->rev_id +0x10 ;break ; +case IP_VERSION (11 ,0 ,1 ): + adev->cg_flags =0 ; + adev->pg_flags =0 ; + adev->external_rev_id = adev->rev_id +0x1 ; +break ;default :/* FIXME: not supported yet */ return -EINVAL ;
Signature · 1 line
2.35.1
Alex Deucher
maintainerPATCH 1/1 drm/amdgpu/discovery: enable ih v6 for OSS 6.0.1
In reply to Alex DeucherFrom: Huang Rui <[email protected]>
Enable ih (interrupt handler) v6 for OSS 6.0.1.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c +1 -0
@@ -1561,6 +1561,7 @@ static int amdgpu_discovery_set_ih_ip_blocks(struct amdgpu_device *adev)amdgpu_device_ip_block_add (adev, &navi10_ih_ip_block);break ;case IP_VERSION (6 ,0 ,0 ): +case IP_VERSION (6 ,0 ,1 ):case IP_VERSION (6 ,0 ,2 ):amdgpu_device_ip_block_add (adev, &ih_v6_0_ip_block);break ;
Signature · 1 line
2.35.1
Alex Deucher
maintainerPATCH 1/1 drm/amdgpu: add gfx support for GC 11.0.1
In reply to Alex DeucherFrom: Huang Rui <[email protected]>
Add GC 11.0.1 gfx support to gfx11 implementation.
v2: squash in golden regs
--- drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c | 36 ++++++++++++++++++++++++++ 1 file changed, 36 insertions(+)
drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c +36 -0
@@ -54,11 +54,18 @@#define RLCG_UCODE_LOADING_START_ADDRESS 0x00002000L +#define regCGTT_WD_CLK_CTRL 0x5086 +#define regCGTT_WD_CLK_CTRL_BASE_IDX 1 +MODULE_FIRMWARE ("amdgpu/gc_11_0_0_pfp.bin" );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_1_pfp.bin" ); +MODULE_FIRMWARE ("amdgpu/gc_11_0_1_me.bin" ); +MODULE_FIRMWARE ("amdgpu/gc_11_0_1_mec.bin" ); +MODULE_FIRMWARE ("amdgpu/gc_11_0_1_rlc.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" );
@@ -79,6 +86,19 @@ static const struct soc15_reg_golden golden_settings_gc_rlc_spm_11_0[] =/* Pending on emulation bring up */ }; +static const struct soc15_reg_golden golden_settings_gc_11_0_1[] = +{ +SOC15_REG_GOLDEN_VALUE (GC ,0 , regCGTT_GS_NGG_CLK_CTRL,0x9fff8fff ,0x00000010 ), +SOC15_REG_GOLDEN_VALUE (GC ,0 , regCGTT_WD_CLK_CTRL,0xffff8fff ,0x00000010 ), +SOC15_REG_GOLDEN_VALUE (GC ,0 , regCPF_GCR_CNTL,0x0007ffff ,0x0000c200 ), +SOC15_REG_GOLDEN_VALUE (GC ,0 , regGL2C_CTRL3,0xffff001b ,0x00f01988 ), +SOC15_REG_GOLDEN_VALUE (GC ,0 , regPA_CL_ENHANCE,0xf0ffffff ,0x00880007 ), +SOC15_REG_GOLDEN_VALUE (GC ,0 , regPA_SC_ENHANCE_3,0xfffffffd ,0x00000008 ), +SOC15_REG_GOLDEN_VALUE (GC ,0 , regPA_SC_VRS_SURFACE_CNTL_1,0xfff891ff ,0x55480100 ), +SOC15_REG_GOLDEN_VALUE (GC ,0 , regTA_CNTL_AUX,0xf7f7ffff ,0x01030000 ), +SOC15_REG_GOLDEN_VALUE (GC ,0 , regTCP_CNTL2,0xfcffffff ,0x0000000a ) +}; +#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) | \
@@ -263,6 +283,14 @@ static void gfx_v11_0_init_golden_registers(struct amdgpu_device *adev) golden_settings_gc_11_0_0, (const u32)ARRAY_SIZE(golden_settings_gc_11_0_0));break ; +case IP_VERSION (11 ,0 ,1 ): +soc15_program_register_sequence (adev, + golden_settings_gc_11_0, + (const u32 )ARRAY_SIZE (golden_settings_gc_11_0)); +soc15_program_register_sequence (adev, + golden_settings_gc_11_0_1, + (const u32 )ARRAY_SIZE (golden_settings_gc_11_0_1)); +break ;default :break ; }
@@ -1133,6 +1161,13 @@ static int gfx_v11_0_gpu_early_init(struct amdgpu_device *adev) adev->gfx.config.sc_hiz_tile_fifo_size =0 ; adev->gfx.config.sc_earlyz_tile_fifo_size =0x4C0 ;break ; +case IP_VERSION (11 ,0 ,1 ): + 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 ; + adev->gfx.config.sc_hiz_tile_fifo_size =0x80 ; + adev->gfx.config.sc_earlyz_tile_fifo_size =0x300 ; +break ;default :BUG ();break ;
@@ -1553,6 +1588,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 ,1 ):case IP_VERSION (11 ,0 ,2 ): adev->gfx.me.num_me =1 ; adev->gfx.me.num_pipe_per_me =1 ;
Signature · 1 line
2.35.1
Alex Deucher
maintainerPATCH 1/1 drm/amdkfd: add GC 11.0.1 KFD support
In reply to Alex DeucherFrom: Huang Rui <[email protected]>
Add initial support for GC 11.0.1 in KFD compute driver.
--- 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
@@ -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 ,1 ):case IP_VERSION (11 ,0 ,2 ): pcache_info = cache_info; num_of_cache_types =
drivers/gpu/drm/amd/amdkfd/kfd_device.c +7 -0
@@ -73,6 +73,7 @@ static void kfd_device_info_set_sdma_info(struct kfd_dev *kfd)case IP_VERSION (4 ,1 ,2 ):/* RENOIR */ case IP_VERSION (5 ,2 ,1 ):/* VANGOGH */ case IP_VERSION (5 ,2 ,3 ):/* YELLOW_CARP */ +case IP_VERSION (6 ,0 ,1 ): kfd->device_info.num_sdma_queues_per_engine =2 ;break ;case IP_VERSION (4 ,2 ,0 ):/* VEGA20 */
@@ -99,6 +100,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 ,1 ):case IP_VERSION (6 ,0 ,2 ):/* Reserve 1 for paging and 1 for gfx */ kfd->device_info.num_reserved_sdma_queues_per_engine =2 ;
@@ -137,6 +139,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 ,1 ):case IP_VERSION (11 ,0 ,2 ): kfd->device_info.event_interrupt_class = &event_interrupt_class_v11;break ;
@@ -369,6 +372,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 ,1 ): + gfx_target_version =110003 ; + f2g = &gfx_v11_kfd2kgd; +break ;case IP_VERSION (11 ,0 ,2 ): gfx_target_version =110002 ; f2g = &gfx_v11_kfd2kgd;
Signature · 1 line
2.35.1
Alex Deucher
maintainerPATCH 1/1 drm/amdgpu/discovery: set flag for GC 11.0.1
In reply to Alex DeucherSet the APU flag appropriately for GC 11.0.1.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c +1 -0
@@ -2152,6 +2152,7 @@ int amdgpu_discovery_set_ip_blocks(struct amdgpu_device *adev)case IP_VERSION (10 ,3 ,3 ):case IP_VERSION (10 ,3 ,6 ):case IP_VERSION (10 ,3 ,7 ): +case IP_VERSION (11 ,0 ,1 ): adev->flags |=AMD_IS_APU ;break ;default :
Signature · 1 line
2.35.1
Alex Deucher
maintainerPATCH 1/1 drm/amdgpu: add GC v11.0.1 into mes v11
In reply to Alex DeucherFrom: Huang Rui <[email protected]>
Add GC v11.0.1 support into mes v11.
--- 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_1_mes.bin" ); +MODULE_FIRMWARE ("amdgpu/gc_11_0_1_mes1.bin" );MODULE_FIRMWARE ("amdgpu/gc_11_0_2_mes.bin" );MODULE_FIRMWARE ("amdgpu/gc_11_0_2_mes1.bin" );
Signature · 1 line
2.35.1
Alex Deucher
maintainerPATCH 1/1 drm/amdgpu: enable imu firmware for GC 11.0.1
In reply to Alex DeucherFrom: Huang Rui <[email protected]>
The GC 11.0.1 needs load IMU to power up the GFX before loads GFX 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_1_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/discovery: enable gfx v11 for GC 11.0.1
In reply to Alex DeucherFrom: Huang Rui <[email protected]>
Enable gfx v11 for GC 11.0.1.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c +1 -0
@@ -1749,6 +1749,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 ,1 ):case IP_VERSION (11 ,0 ,2 ):amdgpu_device_ip_block_add (adev, &gfx_v11_0_ip_block);break ;
Signature · 1 line
2.35.1
Alex Deucher
maintainerPATCH 1/1 drm/amdgpu/discovery: enable mes support for GC v11.0.1
In reply to Alex DeucherFrom: Huang Rui <[email protected]>
GC v11.0.1 is using MES v11, so add IP block.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c +1 -0
@@ -1908,6 +1908,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 ,1 ):case IP_VERSION (11 ,0 ,2 ):amdgpu_device_ip_block_add (adev, &mes_v11_0_ip_block); adev->enable_mes = true;
Signature · 1 line
2.35.1