diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3935-drm-amdgpu-move-mmhub_ras_if-from-gmc-to-mmhub-block.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3935-drm-amdgpu-move-mmhub_ras_if-from-gmc-to-mmhub-block.patch | 84 |
1 files changed, 84 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3935-drm-amdgpu-move-mmhub_ras_if-from-gmc-to-mmhub-block.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3935-drm-amdgpu-move-mmhub_ras_if-from-gmc-to-mmhub-block.patch new file mode 100644 index 00000000..d3861f4d --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3935-drm-amdgpu-move-mmhub_ras_if-from-gmc-to-mmhub-block.patch @@ -0,0 +1,84 @@ +From c1e252066c84b0aee58d6d81ba402aeb959c1724 Mon Sep 17 00:00:00 2001 +From: Tao Zhou <tao.zhou1@amd.com> +Date: Thu, 12 Sep 2019 17:21:46 +0800 +Subject: [PATCH 3935/4256] drm/amdgpu: move mmhub_ras_if from gmc to mmhub + block + +mmhub_ras_if is relevant to mmhub + +Signed-off-by: Tao Zhou <tao.zhou1@amd.com> +Reviewed-by: Guchun Chen <guchun.chen@amd.com> +--- + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h | 1 - + drivers/gpu/drm/amd/amdgpu/amdgpu_mmhub.c | 24 +++++++++++------------ + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 4 ++-- + 3 files changed, 14 insertions(+), 15 deletions(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h +index 7cfb0b72161e..a0c04f1fb256 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h +@@ -181,7 +181,6 @@ struct amdgpu_gmc { + + struct amdgpu_xgmi xgmi; + struct amdgpu_irq_src ecc_irq; +- struct ras_common_if *mmhub_ras_if; + }; + + #define amdgpu_gmc_flush_gpu_tlb(adev, vmid, vmhub, type) ((adev)->gmc.gmc_funcs->flush_gpu_tlb((adev), (vmid), (vmhub), (type))) +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_mmhub.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_mmhub.c +index 99ef6b1f8526..fe1709ee8f4b 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_mmhub.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_mmhub.c +@@ -35,21 +35,21 @@ int amdgpu_mmhub_ras_late_init(struct amdgpu_device *adev) + .debugfs_name = "mmhub_err_inject", + }; + +- if (!adev->gmc.mmhub_ras_if) { +- adev->gmc.mmhub_ras_if = kmalloc(sizeof(struct ras_common_if), GFP_KERNEL); +- if (!adev->gmc.mmhub_ras_if) ++ if (!adev->mmhub.ras_if) { ++ adev->mmhub.ras_if = kmalloc(sizeof(struct ras_common_if), GFP_KERNEL); ++ if (!adev->mmhub.ras_if) + return -ENOMEM; +- adev->gmc.mmhub_ras_if->block = AMDGPU_RAS_BLOCK__MMHUB; +- adev->gmc.mmhub_ras_if->type = AMDGPU_RAS_ERROR__MULTI_UNCORRECTABLE; +- adev->gmc.mmhub_ras_if->sub_block_index = 0; +- strcpy(adev->gmc.mmhub_ras_if->name, "mmhub"); ++ adev->mmhub.ras_if->block = AMDGPU_RAS_BLOCK__MMHUB; ++ adev->mmhub.ras_if->type = AMDGPU_RAS_ERROR__MULTI_UNCORRECTABLE; ++ adev->mmhub.ras_if->sub_block_index = 0; ++ strcpy(adev->mmhub.ras_if->name, "mmhub"); + } +- ih_info.head = fs_info.head = *adev->gmc.mmhub_ras_if; +- r = amdgpu_ras_late_init(adev, adev->gmc.mmhub_ras_if, ++ ih_info.head = fs_info.head = *adev->mmhub.ras_if; ++ r = amdgpu_ras_late_init(adev, adev->mmhub.ras_if, + &fs_info, &ih_info); +- if (r || !amdgpu_ras_is_supported(adev, adev->gmc.mmhub_ras_if->block)) { +- kfree(adev->gmc.mmhub_ras_if); +- adev->gmc.mmhub_ras_if = NULL; ++ if (r || !amdgpu_ras_is_supported(adev, adev->mmhub.ras_if->block)) { ++ kfree(adev->mmhub.ras_if); ++ adev->mmhub.ras_if = NULL; + } + + return r; +diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c +index 8f9373d57c48..06f2d073db55 100644 +--- a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c ++++ b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c +@@ -1135,8 +1135,8 @@ static int gmc_v9_0_sw_fini(void *handle) + } + + if (amdgpu_ras_is_supported(adev, AMDGPU_RAS_BLOCK__MMHUB) && +- adev->gmc.mmhub_ras_if) { +- struct ras_common_if *ras_if = adev->gmc.mmhub_ras_if; ++ adev->mmhub.ras_if) { ++ struct ras_common_if *ras_if = adev->mmhub.ras_if; + + /* remove fs and disable ras feature */ + amdgpu_ras_debugfs_remove(adev, ras_if); +-- +2.17.1 + |