tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

drm/amdgpu: Add soc config init for GC9.4.3 ASICs

Add function to initialize soc configuration information for GC 9.4.3
ASICs. Use it to map IPs and other SOC related information once IP
configuration information is available through discovery.

For GC9.4.3 compute partition related callbacks are initialized as part
of configuration init.

Signed-off-by: Lijo Lazar <lijo.lazar@amd.com>
Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

authored by

Lijo Lazar and committed by
Alex Deucher e56c9ef6 9cb18287

+17 -3
+3 -3
drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
··· 1983 1983 return 0; 1984 1984 } 1985 1985 1986 - static void amdgpu_discovery_ip_map_init(struct amdgpu_device *adev) 1986 + static void amdgpu_discovery_init_soc_config(struct amdgpu_device *adev) 1987 1987 { 1988 1988 switch (adev->ip_versions[GC_HWIP][0]) { 1989 1989 case IP_VERSION(9, 4, 3): 1990 - aqua_vanjaram_ip_map_init(adev); 1990 + aqua_vanjaram_init_soc_config(adev); 1991 1991 break; 1992 1992 default: 1993 1993 break; ··· 2171 2171 break; 2172 2172 } 2173 2173 2174 - amdgpu_discovery_ip_map_init(adev); 2174 + amdgpu_discovery_init_soc_config(adev); 2175 2175 2176 2176 switch (adev->ip_versions[GC_HWIP][0]) { 2177 2177 case IP_VERSION(9, 0, 1):
+13
drivers/gpu/drm/amd/amdgpu/aqua_vanjaram_reg_init.c
··· 351 351 352 352 return ret; 353 353 } 354 + 355 + int aqua_vanjaram_init_soc_config(struct amdgpu_device *adev) 356 + { 357 + int ret; 358 + 359 + ret = aqua_vanjaram_xcp_mgr_init(adev); 360 + if (ret) 361 + return ret; 362 + 363 + aqua_vanjaram_ip_map_init(adev); 364 + 365 + return 0; 366 + }
+1
drivers/gpu/drm/amd/amdgpu/soc15.h
··· 113 113 int aldebaran_reg_base_init(struct amdgpu_device *adev); 114 114 void aqua_vanjaram_ip_map_init(struct amdgpu_device *adev); 115 115 u64 aqua_vanjaram_encode_ext_smn_addressing(int ext_id); 116 + int aqua_vanjaram_init_soc_config(struct amdgpu_device *adev); 116 117 117 118 void vega10_doorbell_index_init(struct amdgpu_device *adev); 118 119 void vega20_doorbell_index_init(struct amdgpu_device *adev);