Commit aea1b473 authored by Jonathan Kim's avatar Jonathan Kim Committed by Alex Deucher
Browse files

drm/amdkfd: add debug wave launch mode operation 



Allow the debugger to set wave behaviour on to either normally operate,
halt at launch, trap on every instruction, terminate immediately or
stall on allocation.

Signed-off-by: default avatarJonathan Kim <jonathan.kim@amd.com>
Reviewed-by: default avatarFelix Kuehling <felix.kuehling@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 101827e1

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

+12 −0
Original line number Diff line number Diff line
@@ -107,6 +107,17 @@ static uint32_t kgd_aldebaran_set_wave_launch_trap_override(struct amdgpu_device 
	return data;

}



static uint32_t kgd_aldebaran_set_wave_launch_mode(struct amdgpu_device *adev,

					uint8_t wave_launch_mode,

					uint32_t vmid)

{

	uint32_t data = 0;



	data = REG_SET_FIELD(data, SPI_GDBG_PER_VMID_CNTL, LAUNCH_MODE, wave_launch_mode);



	return data;

}



const struct kfd2kgd_calls aldebaran_kfd2kgd = {

	.program_sh_mem_settings = kgd_gfx_v9_program_sh_mem_settings,

	.set_pasid_vmid_mapping = kgd_gfx_v9_set_pasid_vmid_mapping,
@@ -129,6 +140,7 @@ const struct kfd2kgd_calls aldebaran_kfd2kgd = { 
	.disable_debug_trap = kgd_aldebaran_disable_debug_trap,

	.validate_trap_override_request = kgd_aldebaran_validate_trap_override_request,

	.set_wave_launch_trap_override = kgd_aldebaran_set_wave_launch_trap_override,

	.set_wave_launch_mode = kgd_aldebaran_set_wave_launch_mode,

	.get_iq_wait_times = kgd_gfx_v9_get_iq_wait_times,

	.build_grace_period_packet_info = kgd_gfx_v9_build_grace_period_packet_info,

	.program_trap_handler_settings = kgd_gfx_v9_program_trap_handler_settings,

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

+1 −0
Original line number Diff line number Diff line
@@ -412,6 +412,7 @@ const struct kfd2kgd_calls arcturus_kfd2kgd = { 
	.disable_debug_trap = kgd_arcturus_disable_debug_trap,

	.validate_trap_override_request = kgd_gfx_v9_validate_trap_override_request,

	.set_wave_launch_trap_override = kgd_gfx_v9_set_wave_launch_trap_override,

	.set_wave_launch_mode = kgd_gfx_v9_set_wave_launch_mode,

	.get_iq_wait_times = kgd_gfx_v9_get_iq_wait_times,

	.build_grace_period_packet_info = kgd_gfx_v9_build_grace_period_packet_info,

	.get_cu_occupancy = kgd_gfx_v9_get_cu_occupancy,

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

+25 −0
Original line number Diff line number Diff line
@@ -856,6 +856,30 @@ uint32_t kgd_gfx_v10_set_wave_launch_trap_override(struct amdgpu_device *adev, 
	return 0;

}



uint32_t kgd_gfx_v10_set_wave_launch_mode(struct amdgpu_device *adev,

					uint8_t wave_launch_mode,

					uint32_t vmid)

{

	uint32_t data = 0;

	bool is_mode_set = !!wave_launch_mode;



	mutex_lock(&adev->grbm_idx_mutex);



	kgd_gfx_v10_set_wave_launch_stall(adev, vmid, true);



	data = REG_SET_FIELD(data, SPI_GDBG_WAVE_CNTL2,

			VMID_MASK, is_mode_set ? 1 << vmid : 0);

	data = REG_SET_FIELD(data, SPI_GDBG_WAVE_CNTL2,

			MODE, is_mode_set ? wave_launch_mode : 0);

	WREG32(SOC15_REG_OFFSET(GC, 0, mmSPI_GDBG_WAVE_CNTL2), data);



	kgd_gfx_v10_set_wave_launch_stall(adev, vmid, false);



	mutex_unlock(&adev->grbm_idx_mutex);



	return 0;

}



/* kgd_gfx_v10_get_iq_wait_times: Returns the mmCP_IQ_WAIT_TIME1/2 values

 * The values read are:

 *     ib_offload_wait_time     -- Wait Count for Indirect Buffer Offloads.
@@ -944,6 +968,7 @@ const struct kfd2kgd_calls gfx_v10_kfd2kgd = { 
	.disable_debug_trap = kgd_gfx_v10_disable_debug_trap,

	.validate_trap_override_request = kgd_gfx_v10_validate_trap_override_request,

	.set_wave_launch_trap_override = kgd_gfx_v10_set_wave_launch_trap_override,

	.set_wave_launch_mode = kgd_gfx_v10_set_wave_launch_mode,

	.get_iq_wait_times = kgd_gfx_v10_get_iq_wait_times,

	.build_grace_period_packet_info = kgd_gfx_v10_build_grace_period_packet_info,

	.program_trap_handler_settings = program_trap_handler_settings,

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

+3 −0
Original line number Diff line number Diff line
@@ -36,6 +36,9 @@ uint32_t kgd_gfx_v10_set_wave_launch_trap_override(struct amdgpu_device *adev, 
					     uint32_t trap_mask_request,

					     uint32_t *trap_mask_prev,

					     uint32_t kfd_dbg_trap_cntl_prev);

uint32_t kgd_gfx_v10_set_wave_launch_mode(struct amdgpu_device *adev,

					 uint8_t wave_launch_mode,

					 uint32_t vmid);

void kgd_gfx_v10_get_iq_wait_times(struct amdgpu_device *adev, uint32_t *wait_times);

void kgd_gfx_v10_build_grace_period_packet_info(struct amdgpu_device *adev,

					       uint32_t wait_times,

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

+2 −1
Original line number Diff line number Diff line
@@ -677,6 +677,7 @@ const struct kfd2kgd_calls gfx_v10_3_kfd2kgd = { 
	.enable_debug_trap = kgd_gfx_v10_enable_debug_trap,

	.disable_debug_trap = kgd_gfx_v10_disable_debug_trap,

	.validate_trap_override_request = kgd_gfx_v10_validate_trap_override_request,

	.set_wave_launch_trap_override = kgd_gfx_v10_set_wave_launch_trap_override

	.set_wave_launch_trap_override = kgd_gfx_v10_set_wave_launch_trap_override,

	.set_wave_launch_mode = kgd_gfx_v10_set_wave_launch_mode



};