diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3212-drm-amdgpu-update-interrupt-callback-for-all-ras-cli.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3212-drm-amdgpu-update-interrupt-callback-for-all-ras-cli.patch | 79 |
1 files changed, 79 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3212-drm-amdgpu-update-interrupt-callback-for-all-ras-cli.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3212-drm-amdgpu-update-interrupt-callback-for-all-ras-cli.patch new file mode 100644 index 00000000..c11e4289 --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3212-drm-amdgpu-update-interrupt-callback-for-all-ras-cli.patch @@ -0,0 +1,79 @@ +From d47e3fd7dc46f7fa43ad4cba7c4d0310ef26fa44 Mon Sep 17 00:00:00 2001 +From: Tao Zhou <tao.zhou1@amd.com> +Date: Mon, 22 Jul 2019 20:33:39 +0800 +Subject: [PATCH 3212/4256] drm/amdgpu: update interrupt callback for all ras + clients patch 2/2 + +add err_data parameter in interrupt cb for ras clients + +Signed-off-by: Tao Zhou <tao.zhou1@amd.com> +Reviewed-by: Dennis Li <dennis.li@amd.com> +Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com> +--- + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 2 ++ + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 4 ++-- + drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 2 ++ + 3 files changed, 6 insertions(+), 2 deletions(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +index 1b24a338cbdf..b6569f221b51 100644 +--- a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c ++++ b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +@@ -3962,6 +3962,7 @@ static int gfx_v9_0_early_init(void *handle) + } + + static int gfx_v9_0_process_ras_data_cb(struct amdgpu_device *adev, ++ struct ras_err_data *err_data, + struct amdgpu_iv_entry *entry); + + static int gfx_v9_0_ecc_late_init(void *handle) +@@ -5276,6 +5277,7 @@ static int gfx_v9_0_priv_inst_irq(struct amdgpu_device *adev, + } + + static int gfx_v9_0_process_ras_data_cb(struct amdgpu_device *adev, ++ struct ras_err_data *err_data, + struct amdgpu_iv_entry *entry) + { + /* TODO ue will trigger an interrupt. */ +diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c +index 111ca34fdafe..76769e35a774 100644 +--- a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c ++++ b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c +@@ -239,12 +239,12 @@ static int gmc_v9_0_ecc_interrupt_state(struct amdgpu_device *adev, + } + + static int gmc_v9_0_process_ras_data_cb(struct amdgpu_device *adev, ++ struct ras_err_data *err_data, + struct amdgpu_iv_entry *entry) + { +- struct ras_err_data err_data = {0, 0}; + kgd2kfd_set_sram_ecc_flag(adev->kfd.dev); + if (adev->umc.funcs->query_ras_error_count) +- adev->umc.funcs->query_ras_error_count(adev, &err_data); ++ adev->umc.funcs->query_ras_error_count(adev, err_data); + amdgpu_ras_reset_gpu(adev, 0); + return AMDGPU_RAS_UE; + } +diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c +index 1e2f3d949d2e..bf9365c6e9b7 100644 +--- a/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c ++++ b/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c +@@ -1626,6 +1626,7 @@ static int sdma_v4_0_early_init(void *handle) + } + + static int sdma_v4_0_process_ras_data_cb(struct amdgpu_device *adev, ++ struct ras_err_data *err_data, + struct amdgpu_iv_entry *entry); + + static int sdma_v4_0_late_init(void *handle) +@@ -1959,6 +1960,7 @@ static int sdma_v4_0_process_trap_irq(struct amdgpu_device *adev, + } + + static int sdma_v4_0_process_ras_data_cb(struct amdgpu_device *adev, ++ struct ras_err_data *err_data, + struct amdgpu_iv_entry *entry) + { + uint32_t instance, err_source; +-- +2.17.1 + |