diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3932-drm-amdgpu-move-umc_ras_if-from-gmc-to-umc-block.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3932-drm-amdgpu-move-umc_ras_if-from-gmc-to-umc-block.patch | 120 |
1 files changed, 120 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3932-drm-amdgpu-move-umc_ras_if-from-gmc-to-umc-block.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3932-drm-amdgpu-move-umc_ras_if-from-gmc-to-umc-block.patch new file mode 100644 index 00000000..a871a2e6 --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3932-drm-amdgpu-move-umc_ras_if-from-gmc-to-umc-block.patch @@ -0,0 +1,120 @@ +From 5262d5f0d2b7ebc4b732607697b33ea89018278d Mon Sep 17 00:00:00 2001 +From: Tao Zhou <tao.zhou1@amd.com> +Date: Thu, 12 Sep 2019 16:34:08 +0800 +Subject: [PATCH 3932/4256] drm/amdgpu: move umc_ras_if from gmc to umc block + +umc_ras_if is relevant to umc + +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_umc.c | 28 ++++++++++++------------- + drivers/gpu/drm/amd/amdgpu/amdgpu_umc.h | 1 + + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 4 ++-- + 4 files changed, 17 insertions(+), 17 deletions(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h +index 88894fd2784d..7cfb0b72161e 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 *umc_ras_if; + struct ras_common_if *mmhub_ras_if; + }; + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c +index d11b4d38ca1e..acc0c428f6fa 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c +@@ -35,24 +35,24 @@ int amdgpu_umc_ras_late_init(struct amdgpu_device *adev, void *ras_ih_info) + if (!ih_info) + return -EINVAL; + +- if (!adev->gmc.umc_ras_if) { +- adev->gmc.umc_ras_if = ++ if (!adev->umc.ras_if) { ++ adev->umc.ras_if = + kmalloc(sizeof(struct ras_common_if), GFP_KERNEL); +- if (!adev->gmc.umc_ras_if) ++ if (!adev->umc.ras_if) + return -ENOMEM; +- adev->gmc.umc_ras_if->block = AMDGPU_RAS_BLOCK__UMC; +- adev->gmc.umc_ras_if->type = AMDGPU_RAS_ERROR__MULTI_UNCORRECTABLE; +- adev->gmc.umc_ras_if->sub_block_index = 0; +- strcpy(adev->gmc.umc_ras_if->name, "umc"); ++ adev->umc.ras_if->block = AMDGPU_RAS_BLOCK__UMC; ++ adev->umc.ras_if->type = AMDGPU_RAS_ERROR__MULTI_UNCORRECTABLE; ++ adev->umc.ras_if->sub_block_index = 0; ++ strcpy(adev->umc.ras_if->name, "umc"); + } +- ih_info->head = fs_info.head = *adev->gmc.umc_ras_if; ++ ih_info->head = fs_info.head = *adev->umc.ras_if; + +- r = amdgpu_ras_late_init(adev, adev->gmc.umc_ras_if, ++ r = amdgpu_ras_late_init(adev, adev->umc.ras_if, + &fs_info, ih_info); + if (r) + goto free; + +- if (amdgpu_ras_is_supported(adev, adev->gmc.umc_ras_if->block)) { ++ if (amdgpu_ras_is_supported(adev, adev->umc.ras_if->block)) { + r = amdgpu_irq_get(adev, &adev->gmc.ecc_irq, 0); + if (r) + goto late_fini; +@@ -68,10 +68,10 @@ int amdgpu_umc_ras_late_init(struct amdgpu_device *adev, void *ras_ih_info) + return 0; + + late_fini: +- amdgpu_ras_late_fini(adev, adev->gmc.umc_ras_if, ih_info); ++ amdgpu_ras_late_fini(adev, adev->umc.ras_if, ih_info); + free: +- kfree(adev->gmc.umc_ras_if); +- adev->gmc.umc_ras_if = NULL; ++ kfree(adev->umc.ras_if); ++ adev->umc.ras_if = NULL; + return r; + } + +@@ -125,7 +125,7 @@ int amdgpu_umc_process_ecc_irq(struct amdgpu_device *adev, + struct amdgpu_irq_src *source, + struct amdgpu_iv_entry *entry) + { +- struct ras_common_if *ras_if = adev->gmc.umc_ras_if; ++ struct ras_common_if *ras_if = adev->umc.ras_if; + struct ras_dispatch_if ih_data = { + .entry = entry, + }; +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_umc.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_umc.h +index 9ac1c2f79299..72c378aec724 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_umc.h ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_umc.h +@@ -77,6 +77,7 @@ struct amdgpu_umc { + uint32_t channel_offs; + /* channel index table of interleaved memory */ + const uint32_t *channel_idx_tbl; ++ struct ras_common_if *ras_if; + + const struct amdgpu_umc_funcs *funcs; + }; +diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c +index d6a99e2d6343..307b153e42c1 100644 +--- a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c ++++ b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c +@@ -1119,8 +1119,8 @@ static int gmc_v9_0_sw_fini(void *handle) + void *stolen_vga_buf; + + if (amdgpu_ras_is_supported(adev, AMDGPU_RAS_BLOCK__UMC) && +- adev->gmc.umc_ras_if) { +- struct ras_common_if *ras_if = adev->gmc.umc_ras_if; ++ adev->umc.ras_if) { ++ struct ras_common_if *ras_if = adev->umc.ras_if; + struct ras_ih_if ih_info = { + .head = *ras_if, + }; +-- +2.17.1 + |