diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3951-drm-amdgpu-replace-DRM_ERROR-with-DRM_WARN-in-ras_re.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3951-drm-amdgpu-replace-DRM_ERROR-with-DRM_WARN-in-ras_re.patch | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3951-drm-amdgpu-replace-DRM_ERROR-with-DRM_WARN-in-ras_re.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3951-drm-amdgpu-replace-DRM_ERROR-with-DRM_WARN-in-ras_re.patch new file mode 100644 index 00000000..be68cc8a --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3951-drm-amdgpu-replace-DRM_ERROR-with-DRM_WARN-in-ras_re.patch @@ -0,0 +1,43 @@ +From d11fb986dce4d6c323eecece70c3622f97561a3b Mon Sep 17 00:00:00 2001 +From: Tao Zhou <tao.zhou1@amd.com> +Date: Thu, 12 Sep 2019 18:57:23 +0800 +Subject: [PATCH 3951/4256] drm/amdgpu: replace DRM_ERROR with DRM_WARN in + ras_reserve_bad_pages + +There are two cases of reserve error should be ignored: +1) a ras bad page has been allocated (used by someone); +2) a ras bad page has been reserved (duplicate error injection for one page); + +DRM_ERROR is unnecessary for the failure of bad page reserve + +Signed-off-by: Tao Zhou <tao.zhou1@amd.com> +Reviewed-by: Guchun Chen <guchun.chen@amd.com> +Signed-off-by: Alex Deucher <alexander.deucher@amd.com> +--- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c +index 2cd94d4b3309..6e46f1afcb03 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c +@@ -1448,10 +1448,15 @@ int amdgpu_ras_reserve_bad_pages(struct amdgpu_device *adev) + for (i = data->last_reserved; i < data->count; i++) { + bp = data->bps[i].retired_page; + ++ /* There are two cases of reserve error should be ignored: ++ * 1) a ras bad page has been allocated (used by someone); ++ * 2) a ras bad page has been reserved (duplicate error injection ++ * for one page); ++ */ + if (amdgpu_bo_create_kernel_at(adev, bp << PAGE_SHIFT, PAGE_SIZE, + AMDGPU_GEM_DOMAIN_VRAM, + &bo, NULL)) +- DRM_ERROR("RAS ERROR: reserve vram %llx fail\n", bp); ++ DRM_WARN("RAS WARN: reserve vram for retired page %llx fail\n", bp); + + data->bps_bo[i] = bo; + data->last_reserved = i + 1; +-- +2.17.1 + |