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

drm/amdkfd: always enable ttmp setup for gfx12 



Similar to GFX11, always enable the setup of trap temporaries on GFX12.

Signed-off-by: default avatarJonathan Kim <jonathan.kim@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 782b9343

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

+1 −1
Original line number Diff line number Diff line
@@ -205,7 +205,7 @@ static uint32_t kgd_gfx_v12_disable_debug_trap(struct amdgpu_device *adev, 
{

	uint32_t data = 0;



	data = REG_SET_FIELD(data, SPI_GDBG_PER_VMID_CNTL, TRAP_EN, keep_trap_enabled);

	data = REG_SET_FIELD(data, SPI_GDBG_PER_VMID_CNTL, TRAP_EN, 1);

	data = REG_SET_FIELD(data, SPI_GDBG_PER_VMID_CNTL, EXCP_EN, 0);

	data = REG_SET_FIELD(data, SPI_GDBG_PER_VMID_CNTL, EXCP_REPLACE, 0);

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

+1 −0
Original line number Diff line number Diff line
@@ -1446,6 +1446,7 @@ static void gfx_v12_0_init_compute_vmid(struct amdgpu_device *adev) 
		/* Enable trap for each kfd vmid. */

		data = RREG32_SOC15(GC, 0, regSPI_GDBG_PER_VMID_CNTL);

		data = REG_SET_FIELD(data, SPI_GDBG_PER_VMID_CNTL, TRAP_EN, 1);

		WREG32_SOC15(GC, 0, regSPI_GDBG_PER_VMID_CNTL, data);

	}

	soc24_grbm_select(adev, 0, 0, 0, 0);

	mutex_unlock(&adev->srbm_mutex);

drivers/gpu/drm/amd/amdkfd/kfd_debug.h

+2 −1
Original line number Diff line number Diff line
@@ -135,6 +135,7 @@ static inline bool kfd_dbg_has_ttmps_always_setup(struct kfd_node *dev) 
			KFD_GC_VERSION(dev) != IP_VERSION(9, 4, 2)) ||

	       (KFD_GC_VERSION(dev) >= IP_VERSION(11, 0, 0) &&

			KFD_GC_VERSION(dev) < IP_VERSION(12, 0, 0) &&

			(dev->adev->mes.sched_version & AMDGPU_MES_VERSION_MASK) >= 70);

			(dev->adev->mes.sched_version & AMDGPU_MES_VERSION_MASK) >= 70) ||

	       (KFD_GC_VERSION(dev) >= IP_VERSION(12, 0, 0));

}

#endif