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

drm/amdgpu/amdkfd: clean up mmhub and gfxhub includes

Use the appropriate mmhub and gfxhub headers rather than adding
them to the gmc9 header.

Reviewed-by: Felix Kuehling <Felix.Kuehling@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

+6 -7
+2 -1
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c
··· 46 46 #include "v9_structs.h" 47 47 #include "soc15.h" 48 48 #include "soc15d.h" 49 - #include "gmc_v9_0.h" 49 + #include "mmhub_v1_0.h" 50 + #include "gfxhub_v1_0.h" 50 51 51 52 52 53 #define V9_PIPE_PER_MEC (4)
+2
drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.h
··· 30 30 bool value); 31 31 void gfxhub_v1_0_init(struct amdgpu_device *adev); 32 32 u64 gfxhub_v1_0_get_mc_fb_offset(struct amdgpu_device *adev); 33 + void gfxhub_v1_0_setup_vm_pt_regs(struct amdgpu_device *adev, uint32_t vmid, 34 + uint64_t page_table_base); 33 35 34 36 #endif
-6
drivers/gpu/drm/amd/amdgpu/gmc_v9_0.h
··· 27 27 extern const struct amd_ip_funcs gmc_v9_0_ip_funcs; 28 28 extern const struct amdgpu_ip_block_version gmc_v9_0_ip_block; 29 29 30 - /* amdgpu_amdkfd*.c */ 31 - void gfxhub_v1_0_setup_vm_pt_regs(struct amdgpu_device *adev, uint32_t vmid, 32 - uint64_t page_table_base); 33 - void mmhub_v1_0_setup_vm_pt_regs(struct amdgpu_device *adev, uint32_t vmid, 34 - uint64_t page_table_base); 35 - 36 30 #endif
+2
drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.h
··· 34 34 void mmhub_v1_0_get_clockgating(struct amdgpu_device *adev, u32 *flags); 35 35 void mmhub_v1_0_update_power_gating(struct amdgpu_device *adev, 36 36 bool enable); 37 + void mmhub_v1_0_setup_vm_pt_regs(struct amdgpu_device *adev, uint32_t vmid, 38 + uint64_t page_table_base); 37 39 38 40 #endif