diff options
author | Amber Lin <Amber.Lin@amd.com> | 2022-03-23 18:01:52 +0300 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2023-06-09 16:43:26 +0300 |
commit | d25555866172a0454b0dc1374b0ff29e1ae5f676 (patch) | |
tree | 2aa76b64687e2374d7b8e27b78dd4ba863549a5f /drivers/gpu/drm/amd/amdgpu/gfxhub_v1_2.c | |
parent | 5db392a04575120de4e73ee10c0dc727426100c7 (diff) | |
download | linux-d25555866172a0454b0dc1374b0ff29e1ae5f676.tar.xz |
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>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/gfxhub_v1_2.c')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/gfxhub_v1_2.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/gfxhub_v1_2.c b/drivers/gpu/drm/amd/amdgpu/gfxhub_v1_2.c index e5016fea1f28..d74621662311 100644 --- a/drivers/gpu/drm/amd/amdgpu/gfxhub_v1_2.c +++ b/drivers/gpu/drm/amd/amdgpu/gfxhub_v1_2.c @@ -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, |