diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3765-drm-amdgpu-move-umc-ras-init-to-umc-block.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3765-drm-amdgpu-move-umc-ras-init-to-umc-block.patch | 48 |
1 files changed, 48 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3765-drm-amdgpu-move-umc-ras-init-to-umc-block.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3765-drm-amdgpu-move-umc-ras-init-to-umc-block.patch new file mode 100644 index 00000000..40d556eb --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3765-drm-amdgpu-move-umc-ras-init-to-umc-block.patch @@ -0,0 +1,48 @@ +From 4a9b9fbbcc161b275bbe42fbb5e681a296e501bb Mon Sep 17 00:00:00 2001 +From: Tao Zhou <tao.zhou1@amd.com> +Date: Thu, 5 Sep 2019 19:25:18 +0800 +Subject: [PATCH 3765/4256] drm/amdgpu: move umc ras init to umc block + +move umc ras init from ras module to umc block, generic ras module +should pay less attention to specific ras block. + +Signed-off-by: Tao Zhou <tao.zhou1@amd.com> +Reviewed-by: Guchun Chen <guchun.chen@amd.com> +--- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 4 ---- + drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c | 4 ++++ + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c +index 119bedc9802a..a9aba06c9452 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c +@@ -1653,10 +1653,6 @@ int amdgpu_ras_init(struct amdgpu_device *adev) + if (amdgpu_ras_fs_init(adev)) + goto fs_out; + +- /* ras init for each ras block */ +- if (adev->umc.funcs->ras_init) +- adev->umc.funcs->ras_init(adev); +- + DRM_INFO("RAS INFO: ras initialized successfully, " + "hardware ability[%x] ras_mask[%x]\n", + con->hw_supported, con->supported); +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c +index c8de127097ab..5683c51710aa 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c +@@ -62,6 +62,10 @@ int amdgpu_umc_ras_late_init(struct amdgpu_device *adev, void *ras_ih_info) + goto free; + } + ++ /* ras init of specific umc version */ ++ if (adev->umc.funcs && adev->umc.funcs->ras_init) ++ adev->umc.funcs->ras_init(adev); ++ + return 0; + + late_fini: +-- +2.17.1 + |