Commit e4312d45 authored by Alex Deucher's avatar Alex Deucher
Browse files

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: default avatarFelix Kuehling <Felix.Kuehling@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 3ba7b418

drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c

+2 −1
Original line number Diff line number Diff line
@@ -46,7 +46,8 @@ 
#include "v9_structs.h"

#include "soc15.h"

#include "soc15d.h"

#include "gmc_v9_0.h"

#include "mmhub_v1_0.h"

#include "gfxhub_v1_0.h"





#define V9_PIPE_PER_MEC		(4)

drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.h

+2 −0
Original line number Diff line number Diff line
@@ -30,5 +30,7 @@ void gfxhub_v1_0_set_fault_enable_default(struct amdgpu_device *adev, 
					  bool value);

void gfxhub_v1_0_init(struct amdgpu_device *adev);

u64 gfxhub_v1_0_get_mc_fb_offset(struct amdgpu_device *adev);

void gfxhub_v1_0_setup_vm_pt_regs(struct amdgpu_device *adev, uint32_t vmid,

				uint64_t page_table_base);



#endif

drivers/gpu/drm/amd/amdgpu/gmc_v9_0.h

+0 −6
Original line number Diff line number Diff line
@@ -27,10 +27,4 @@ 
extern const struct amd_ip_funcs gmc_v9_0_ip_funcs;

extern const struct amdgpu_ip_block_version gmc_v9_0_ip_block;



/* amdgpu_amdkfd*.c */

void gfxhub_v1_0_setup_vm_pt_regs(struct amdgpu_device *adev, uint32_t vmid,

				uint64_t page_table_base);

void mmhub_v1_0_setup_vm_pt_regs(struct amdgpu_device *adev, uint32_t vmid,

				uint64_t page_table_base);



#endif

drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.h

+2 −0
Original line number Diff line number Diff line
@@ -34,5 +34,7 @@ int mmhub_v1_0_set_clockgating(struct amdgpu_device *adev, 
void mmhub_v1_0_get_clockgating(struct amdgpu_device *adev, u32 *flags);

void mmhub_v1_0_update_power_gating(struct amdgpu_device *adev,

                                bool enable);

void mmhub_v1_0_setup_vm_pt_regs(struct amdgpu_device *adev, uint32_t vmid,

				uint64_t page_table_base);



#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE