diff options
Diffstat (limited to 'common/recipes-kernel/linux/linux-yocto-4.19.8/1629-drm-amdgpu-re-enable-retry-faults.patch')
| -rw-r--r-- | common/recipes-kernel/linux/linux-yocto-4.19.8/1629-drm-amdgpu-re-enable-retry-faults.patch | 47 |
1 files changed, 47 insertions, 0 deletions
diff --git a/common/recipes-kernel/linux/linux-yocto-4.19.8/1629-drm-amdgpu-re-enable-retry-faults.patch b/common/recipes-kernel/linux/linux-yocto-4.19.8/1629-drm-amdgpu-re-enable-retry-faults.patch new file mode 100644 index 00000000..b1cdf249 --- /dev/null +++ b/common/recipes-kernel/linux/linux-yocto-4.19.8/1629-drm-amdgpu-re-enable-retry-faults.patch @@ -0,0 +1,47 @@ +From 40d2a543f9c68aedd379f7e30b600ca85f322512 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Christian=20K=C3=B6nig?= <christian.koenig@amd.com> +Date: Mon, 5 Nov 2018 15:24:27 +0100 +Subject: [PATCH 1629/2940] drm/amdgpu: re-enable retry faults +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +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> +--- + drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c b/drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c +index 065f21d4bcba..f2eb96c506c0 100644 +--- a/drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c ++++ b/drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c +@@ -231,7 +231,7 @@ static void gfxhub_v1_0_setup_vmid_config(struct amdgpu_device *adev) + block_size); + /* Send no-retry XNACK on fault to suppress VM fault storm. */ + tmp = REG_SET_FIELD(tmp, VM_CONTEXT1_CNTL, +- RETRY_PERMISSION_OR_INVALID_PAGE_FAULT, 0); ++ RETRY_PERMISSION_OR_INVALID_PAGE_FAULT, 1); + WREG32_SOC15_OFFSET(GC, 0, mmVM_CONTEXT1_CNTL, i, tmp); + WREG32_SOC15_OFFSET(GC, 0, mmVM_CONTEXT1_PAGE_TABLE_START_ADDR_LO32, i*2, 0); + WREG32_SOC15_OFFSET(GC, 0, mmVM_CONTEXT1_PAGE_TABLE_START_ADDR_HI32, i*2, 0); +diff --git a/drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c b/drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c +index 5a9d6787c00d..020be5484fe0 100644 +--- a/drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c ++++ b/drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c +@@ -250,7 +250,7 @@ static void mmhub_v1_0_setup_vmid_config(struct amdgpu_device *adev) + block_size); + /* Send no-retry XNACK on fault to suppress VM fault storm. */ + tmp = REG_SET_FIELD(tmp, VM_CONTEXT1_CNTL, +- RETRY_PERMISSION_OR_INVALID_PAGE_FAULT, 0); ++ RETRY_PERMISSION_OR_INVALID_PAGE_FAULT, 1); + WREG32_SOC15_OFFSET(MMHUB, 0, mmVM_CONTEXT1_CNTL, i, tmp); + WREG32_SOC15_OFFSET(MMHUB, 0, mmVM_CONTEXT1_PAGE_TABLE_START_ADDR_LO32, i*2, 0); + WREG32_SOC15_OFFSET(MMHUB, 0, mmVM_CONTEXT1_PAGE_TABLE_START_ADDR_HI32, i*2, 0); +-- +2.17.1 + |