diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3927-drm-amdgpu-update-parameter-of-ras_ih_cb.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3927-drm-amdgpu-update-parameter-of-ras_ih_cb.patch | 103 |
1 files changed, 103 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3927-drm-amdgpu-update-parameter-of-ras_ih_cb.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3927-drm-amdgpu-update-parameter-of-ras_ih_cb.patch new file mode 100644 index 00000000..9dc2dd9a --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3927-drm-amdgpu-update-parameter-of-ras_ih_cb.patch @@ -0,0 +1,103 @@ +From 1d3a7d96ad1de74707e7050da09505e9d3209a80 Mon Sep 17 00:00:00 2001 +From: Tao Zhou <tao.zhou1@amd.com> +Date: Thu, 12 Sep 2019 13:38:44 +0800 +Subject: [PATCH 3927/4256] drm/amdgpu: update parameter of ras_ih_cb + +change struct ras_err_data *err_data to void *err_data, align with +umc code and the callback's declaration in each ras block could +pay no attention to the structure type + +Signed-off-by: Tao Zhou <tao.zhou1@amd.com> +Reviewed-by: Guchun Chen <guchun.chen@amd.com> +--- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h | 2 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 4 ++-- + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 6 ++++-- + drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 4 ++-- + 4 files changed, 9 insertions(+), 7 deletions(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h +index ae386c466c0e..f80fd3428c98 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h +@@ -362,7 +362,7 @@ struct ras_err_handler_data { + }; + + typedef int (*ras_ih_cb)(struct amdgpu_device *adev, +- struct ras_err_data *err_data, ++ void *err_data, + struct amdgpu_iv_entry *entry); + + struct ras_ih_data { +diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +index c1f5970d59e6..edeac8eb8cc6 100644 +--- a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c ++++ b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +@@ -4202,7 +4202,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, ++ void *err_data, + struct amdgpu_iv_entry *entry); + + static int gfx_v9_0_ecc_late_init(void *handle) +@@ -5455,7 +5455,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, ++ void *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 88e09e4e8baf..534c5761c079 100644 +--- a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c ++++ b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c +@@ -242,16 +242,18 @@ 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, ++ void *ras_error_status, + struct amdgpu_iv_entry *entry) + { ++ struct ras_err_data *err_data = (struct ras_err_data *)ras_error_status; ++ + if (amdgpu_ras_is_supported(adev, AMDGPU_RAS_BLOCK__GFX)) + return AMDGPU_RAS_SUCCESS; + + kgd2kfd_set_sram_ecc_flag(adev->kfd.dev); + if (adev->umc.funcs && + 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, ras_error_status); + + if (adev->umc.funcs && + adev->umc.funcs->query_ras_error_address && +diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c +index 06f769acac62..4bb17d85a0ce 100644 +--- a/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c ++++ b/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c +@@ -1689,7 +1689,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, ++ void *err_data, + struct amdgpu_iv_entry *entry); + + static int sdma_v4_0_late_init(void *handle) +@@ -1938,7 +1938,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, ++ void *err_data, + struct amdgpu_iv_entry *entry) + { + uint32_t err_source; +-- +2.17.1 + |