Commit d2555586 authored Mar 23, 2022 by Amber Lin Committed by Alex Deucher Jun 09, 2023

drm/amdgpu: Set XNACK per process on GC 9.4.3



Set RETRY_PERMISSION_OR_INVALID_PAGE_FAULT bit in VM_CONTEXT1_CNTL
as well so XNACK can be enabled in the SQ per process.

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

parent 5db392a0

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

+4 −2

Original line number	Diff line number	Diff line
		@@ -328,13 +328,15 @@ static void gfxhub_v1_2_setup_vmid_config(struct amdgpu_device *adev)
		PAGE_TABLE_BLOCK_SIZE,
		block_size);
		/* Send no-retry XNACK on fault to suppress VM fault storm.
		* On Aldebaran, XNACK can be enabled in the SQ per-process.
		* On 9.4.2 and 9.4.3, XNACK can be enabled in
		* the SQ per-process.
		* Retry faults need to be enabled for that to work.
		*/
		tmp = REG_SET_FIELD(tmp, VM_CONTEXT1_CNTL,
		RETRY_PERMISSION_OR_INVALID_PAGE_FAULT,
		!adev->gmc.noretry \|\|
		adev->asic_type == CHIP_ALDEBARAN);
		adev->ip_versions[GC_HWIP][0] == IP_VERSION(9, 4, 2) \|\|
		adev->ip_versions[GC_HWIP][0] == IP_VERSION(9, 4, 3));
		WREG32_SOC15_OFFSET(GC, j, regVM_CONTEXT1_CNTL,
		i * hub->ctx_distance, tmp);
		WREG32_SOC15_OFFSET(GC, j,

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -288,7 +288,7 @@ static void mmhub_v1_8_setup_vmid_config(struct amdgpu_device *adev)
		tmp = REG_SET_FIELD(tmp, VM_CONTEXT1_CNTL,
		PAGE_TABLE_BLOCK_SIZE,
		block_size);
		/* On Aldebaran, XNACK can be enabled in the SQ per-process.
		/* On 9.4.3, XNACK can be enabled in the SQ per-process.
		* Retry faults need to be enabled for that to work.
		*/
		tmp = REG_SET_FIELD(tmp, VM_CONTEXT1_CNTL,