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 XCP IP callback funcs for each IP

Initialize with the IP specific functions needed for GFXHUB, GFX and
SDMA.

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
845c9b31 73c84f7c

+12 -3
+6 -3
drivers/gpu/drm/amd/amdgpu/aqua_vanjaram_reg_init.c
··· 25 25 26 26 #include "soc15_common.h" 27 27 #include "amdgpu_xcp.h" 28 + #include "gfx_v9_4_3.h" 29 + #include "gfxhub_v1_2.h" 30 + #include "sdma_v4_4_2.h" 28 31 29 32 #define XCP_INST_MASK(num_inst, xcp_id) \ 30 33 (num_inst ? GENMASK(num_inst - 1, 0) << (xcp_id * num_inst) : 0) ··· 208 205 switch (ip_id) { 209 206 case AMDGPU_XCP_GFXHUB: 210 207 ip->inst_mask = XCP_INST_MASK(num_xcc_xcp, xcp_id); 211 - /* TODO : Assign IP funcs */ 208 + ip->ip_funcs = &gfxhub_v1_2_xcp_funcs; 212 209 break; 213 210 case AMDGPU_XCP_GFX: 214 211 ip->inst_mask = XCP_INST_MASK(num_xcc_xcp, xcp_id); 215 - /* TODO : Assign IP funcs */ 212 + ip->ip_funcs = &gfx_v9_4_3_xcp_funcs; 216 213 break; 217 214 case AMDGPU_XCP_SDMA: 218 215 ip->inst_mask = XCP_INST_MASK(num_sdma_xcp, xcp_id); 219 - /* TODO : Assign IP funcs */ 216 + ip->ip_funcs = &sdma_v4_4_2_xcp_funcs; 220 217 break; 221 218 case AMDGPU_XCP_VCN: 222 219 ip->inst_mask = XCP_INST_MASK(num_vcn_xcp, xcp_id);
+2
drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.h
··· 26 26 27 27 extern const struct amdgpu_ip_block_version gfx_v9_4_3_ip_block; 28 28 29 + extern struct amdgpu_xcp_ip_funcs gfx_v9_4_3_xcp_funcs; 30 + 29 31 #endif /* __GFX_V9_4_3_H__ */
+2
drivers/gpu/drm/amd/amdgpu/gfxhub_v1_2.h
··· 26 26 27 27 extern const struct amdgpu_gfxhub_funcs gfxhub_v1_2_funcs; 28 28 29 + extern struct amdgpu_xcp_ip_funcs gfxhub_v1_2_xcp_funcs; 30 + 29 31 #endif
+2
drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.h
··· 27 27 extern const struct amd_ip_funcs sdma_v4_4_2_ip_funcs; 28 28 extern const struct amdgpu_ip_block_version sdma_v4_4_2_ip_block; 29 29 30 + extern struct amdgpu_xcp_ip_funcs sdma_v4_4_2_xcp_funcs; 31 + 30 32 #endif