diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3939-drm-amdgpu-remove-ih_info-parameter-of-umc_ras_late_.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3939-drm-amdgpu-remove-ih_info-parameter-of-umc_ras_late_.patch | 107 |
1 files changed, 107 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3939-drm-amdgpu-remove-ih_info-parameter-of-umc_ras_late_.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3939-drm-amdgpu-remove-ih_info-parameter-of-umc_ras_late_.patch new file mode 100644 index 00000000..aebb1919 --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3939-drm-amdgpu-remove-ih_info-parameter-of-umc_ras_late_.patch @@ -0,0 +1,107 @@ +From 0b9558274eee9a0cbaf7978feb4b5cf75c935aa6 Mon Sep 17 00:00:00 2001 +From: Tao Zhou <tao.zhou1@amd.com> +Date: Thu, 12 Sep 2019 18:54:33 +0800 +Subject: [PATCH 3939/4256] drm/amdgpu: remove ih_info parameter of + umc_ras_late_init + +umc_ras_late_init can get the info by itself + +Signed-off-by: Tao Zhou <tao.zhou1@amd.com> +Reviewed-by: Guchun Chen <guchun.chen@amd.com> +--- + drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c | 15 +++++++-------- + drivers/gpu/drm/amd/amdgpu/amdgpu_umc.h | 4 ++-- + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 5 +---- + 3 files changed, 10 insertions(+), 14 deletions(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c +index acc0c428f6fa..08037f086d28 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c +@@ -23,17 +23,16 @@ + + #include "amdgpu_ras.h" + +-int amdgpu_umc_ras_late_init(struct amdgpu_device *adev, void *ras_ih_info) ++int amdgpu_umc_ras_late_init(struct amdgpu_device *adev) + { + int r; +- struct ras_ih_if *ih_info = (struct ras_ih_if *)ras_ih_info; + struct ras_fs_if fs_info = { + .sysfs_name = "umc_err_count", + .debugfs_name = "umc_err_inject", + }; +- +- if (!ih_info) +- return -EINVAL; ++ struct ras_ih_if ih_info = { ++ .cb = amdgpu_umc_process_ras_data_cb, ++ }; + + if (!adev->umc.ras_if) { + adev->umc.ras_if = +@@ -45,10 +44,10 @@ int amdgpu_umc_ras_late_init(struct amdgpu_device *adev, void *ras_ih_info) + adev->umc.ras_if->sub_block_index = 0; + strcpy(adev->umc.ras_if->name, "umc"); + } +- ih_info->head = fs_info.head = *adev->umc.ras_if; ++ ih_info.head = fs_info.head = *adev->umc.ras_if; + + r = amdgpu_ras_late_init(adev, adev->umc.ras_if, +- &fs_info, ih_info); ++ &fs_info, &ih_info); + if (r) + goto free; + +@@ -68,7 +67,7 @@ int amdgpu_umc_ras_late_init(struct amdgpu_device *adev, void *ras_ih_info) + return 0; + + late_fini: +- amdgpu_ras_late_fini(adev, adev->umc.ras_if, ih_info); ++ amdgpu_ras_late_fini(adev, adev->umc.ras_if, &ih_info); + free: + kfree(adev->umc.ras_if); + adev->umc.ras_if = NULL; +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_umc.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_umc.h +index 72c378aec724..8cc9852e99e6 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_umc.h ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_umc.h +@@ -55,7 +55,7 @@ + + struct amdgpu_umc_funcs { + void (*err_cnt_init)(struct amdgpu_device *adev); +- int (*ras_late_init)(struct amdgpu_device *adev, void *ras_ih_info); ++ int (*ras_late_init)(struct amdgpu_device *adev); + void (*query_ras_error_count)(struct amdgpu_device *adev, + void *ras_error_status); + void (*query_ras_error_address)(struct amdgpu_device *adev, +@@ -82,7 +82,7 @@ struct amdgpu_umc { + const struct amdgpu_umc_funcs *funcs; + }; + +-int amdgpu_umc_ras_late_init(struct amdgpu_device *adev, void *ras_ih_info); ++int amdgpu_umc_ras_late_init(struct amdgpu_device *adev); + int amdgpu_umc_process_ras_data_cb(struct amdgpu_device *adev, + void *ras_error_status, + struct amdgpu_iv_entry *entry); +diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c +index 6570c3f41bf2..a7ef9f3f5207 100644 +--- a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c ++++ b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c +@@ -736,12 +736,9 @@ static int gmc_v9_0_ecc_late_init(void *handle) + { + int r; + struct amdgpu_device *adev = (struct amdgpu_device *)handle; +- struct ras_ih_if umc_ih_info = { +- .cb = amdgpu_umc_process_ras_data_cb, +- }; + + if (adev->umc.funcs && adev->umc.funcs->ras_late_init) { +- r = adev->umc.funcs->ras_late_init(adev, &umc_ih_info); ++ r = adev->umc.funcs->ras_late_init(adev); + if (r) + return r; + } +-- +2.17.1 + |