Commit 9705c85f authored by Felix Kuehling's avatar Felix Kuehling Committed by Alex Deucher
Browse files

drm/amdgpu: Enable retry faults unconditionally on Aldebaran 



This is needed to allow per-process XNACK mode selection in the SQ when
booting with XNACK off by default.

Signed-off-by: default avatarFelix Kuehling <Felix.Kuehling@amd.com>
Reviewed-by: default avatarPhilip Yang <Philip.Yang@amd.com>
Tested-by: default avatarAlex Sierra <alex.sierra@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 8a7c184a

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

+2 −1
Original line number Diff line number Diff line
@@ -640,7 +640,8 @@ module_param_named(mes, amdgpu_mes, int, 0444); 


/**

 * DOC: noretry (int)

 * Disable retry faults in the GPU memory controller.

 * Disable XNACK retry in the SQ by default on GFXv9 hardware. On ASICs that

 * do not support per-process XNACK this also disables retry page faults.

 * (0 = retry enabled, 1 = retry disabled, -1 auto (default))

 */

MODULE_PARM_DESC(noretry,

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

+6 −2
Original line number Diff line number Diff line
@@ -283,10 +283,14 @@ static void gfxhub_v1_0_setup_vmid_config(struct amdgpu_device *adev) 
		tmp = REG_SET_FIELD(tmp, VM_CONTEXT1_CNTL,

				    PAGE_TABLE_BLOCK_SIZE,

				    block_size);

		/* Send no-retry XNACK on fault to suppress VM fault storm. */

		/* Send no-retry XNACK on fault to suppress VM fault storm.

		 * On Aldebaran, 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->gmc.noretry ||

				    adev->asic_type == CHIP_ALDEBARAN);

		WREG32_SOC15_OFFSET(GC, 0, mmVM_CONTEXT1_CNTL,

				    i * hub->ctx_distance, tmp);

		WREG32_SOC15_OFFSET(GC, 0, mmVM_CONTEXT1_PAGE_TABLE_START_ADDR_LO32,

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

+4 −2
Original line number Diff line number Diff line
@@ -296,10 +296,12 @@ static void mmhub_v1_7_setup_vmid_config(struct amdgpu_device *adev) 
		tmp = REG_SET_FIELD(tmp, VM_CONTEXT1_CNTL,

				    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.

		 * 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);

				    1);

		WREG32_SOC15_OFFSET(MMHUB, 0, regVM_CONTEXT1_CNTL,

				    i * hub->ctx_distance, tmp);

		WREG32_SOC15_OFFSET(MMHUB, 0, regVM_CONTEXT1_PAGE_TABLE_START_ADDR_LO32,