Commit f270921a authored by Mukul Joshi's avatar Mukul Joshi Committed by Alex Deucher
Browse files

drm/amdkfd: CWSR with sw scheduler on Aldebaran and Arcturus 



Program trap handler settings to enable CWSR with software scheduler
on Aldebaran and Arcturus.

Signed-off-by: default avatarMukul Joshi <mukul.joshi@amd.com>
Reviewed-by: default avatarAmber Lin <Amber.Lin@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 7301757e

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

+1 −0
Original line number Diff line number Diff line
@@ -44,4 +44,5 @@ const struct kfd2kgd_calls aldebaran_kfd2kgd = { 
	.get_atc_vmid_pasid_mapping_info =

				kgd_gfx_v9_get_atc_vmid_pasid_mapping_info,

	.set_vm_context_page_table_base = kgd_gfx_v9_set_vm_context_page_table_base,

	.program_trap_handler_settings = kgd_gfx_v9_program_trap_handler_settings

};

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

+2 −1
Original line number Diff line number Diff line
@@ -305,5 +305,6 @@ const struct kfd2kgd_calls arcturus_kfd2kgd = { 
				kgd_gfx_v9_get_atc_vmid_pasid_mapping_info,

	.set_vm_context_page_table_base =

				kgd_gfx_v9_set_vm_context_page_table_base,

	.get_cu_occupancy = kgd_gfx_v9_get_cu_occupancy

	.get_cu_occupancy = kgd_gfx_v9_get_cu_occupancy,

	.program_trap_handler_settings = kgd_gfx_v9_program_trap_handler_settings

};

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

+1 −1
Original line number Diff line number Diff line
@@ -882,7 +882,7 @@ void kgd_gfx_v9_get_cu_occupancy(struct kgd_dev *kgd, int pasid, 
				adev->gfx.cu_info.max_waves_per_simd;

}



static void kgd_gfx_v9_program_trap_handler_settings(struct kgd_dev *kgd,

void kgd_gfx_v9_program_trap_handler_settings(struct kgd_dev *kgd,

                        uint32_t vmid, uint64_t tba_addr, uint64_t tma_addr)

{

	struct amdgpu_device *adev = get_amdgpu_device(kgd);

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

+2 −0
Original line number Diff line number Diff line
@@ -65,3 +65,5 @@ void kgd_gfx_v9_set_vm_context_page_table_base(struct kgd_dev *kgd, 
			uint32_t vmid, uint64_t page_table_base);

void kgd_gfx_v9_get_cu_occupancy(struct kgd_dev *kgd, int pasid,

		int *pasid_wave_cnt, int *max_waves_per_cu);

void kgd_gfx_v9_program_trap_handler_settings(struct kgd_dev *kgd,

		uint32_t vmid, uint64_t tba_addr, uint64_t tma_addr);