Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/amdgpu: re-enable retry faults

Now that we have re-reoute faults to the other IH
ring we can enable retries again.

Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Felix Kuehling <Felix.Kuehling@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

authored by

Christian König and committed by
Alex Deucher
f11a13ec f81e8d53

+2 -2
+1 -1
drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c
··· 236 236 block_size); 237 237 /* Send no-retry XNACK on fault to suppress VM fault storm. */ 238 238 tmp = REG_SET_FIELD(tmp, VM_CONTEXT1_CNTL, 239 - RETRY_PERMISSION_OR_INVALID_PAGE_FAULT, 0); 239 + RETRY_PERMISSION_OR_INVALID_PAGE_FAULT, 1); 240 240 WREG32_SOC15_OFFSET(GC, 0, mmVM_CONTEXT1_CNTL, i, tmp); 241 241 WREG32_SOC15_OFFSET(GC, 0, mmVM_CONTEXT1_PAGE_TABLE_START_ADDR_LO32, i*2, 0); 242 242 WREG32_SOC15_OFFSET(GC, 0, mmVM_CONTEXT1_PAGE_TABLE_START_ADDR_HI32, i*2, 0);
+1 -1
drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c
··· 255 255 block_size); 256 256 /* Send no-retry XNACK on fault to suppress VM fault storm. */ 257 257 tmp = REG_SET_FIELD(tmp, VM_CONTEXT1_CNTL, 258 - RETRY_PERMISSION_OR_INVALID_PAGE_FAULT, 0); 258 + RETRY_PERMISSION_OR_INVALID_PAGE_FAULT, 1); 259 259 WREG32_SOC15_OFFSET(MMHUB, 0, mmVM_CONTEXT1_CNTL, i, tmp); 260 260 WREG32_SOC15_OFFSET(MMHUB, 0, mmVM_CONTEXT1_PAGE_TABLE_START_ADDR_LO32, i*2, 0); 261 261 WREG32_SOC15_OFFSET(MMHUB, 0, mmVM_CONTEXT1_PAGE_TABLE_START_ADDR_HI32, i*2, 0);