diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3940-drm-amdgpu-remove-ih_info-parameter-of-gfx_ras_late_.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3940-drm-amdgpu-remove-ih_info-parameter-of-gfx_ras_late_.patch | 100 |
1 files changed, 100 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3940-drm-amdgpu-remove-ih_info-parameter-of-gfx_ras_late_.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3940-drm-amdgpu-remove-ih_info-parameter-of-gfx_ras_late_.patch new file mode 100644 index 00000000..520bcae6 --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3940-drm-amdgpu-remove-ih_info-parameter-of-gfx_ras_late_.patch @@ -0,0 +1,100 @@ +From 5b513fca1696b4936bd333ba29ca3061bd1bbde9 Mon Sep 17 00:00:00 2001 +From: Tao Zhou <tao.zhou1@amd.com> +Date: Thu, 19 Sep 2019 11:46:11 +0800 +Subject: [PATCH 3940/4256] drm/amdgpu: remove ih_info parameter of + gfx_ras_late_init + +gfx_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_gfx.c | 16 +++++++--------- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h | 3 +-- + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 5 +---- + 3 files changed, 9 insertions(+), 15 deletions(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c +index c0d297acb19c..d1c436df0f3a 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c +@@ -571,18 +571,16 @@ void amdgpu_gfx_off_ctrl(struct amdgpu_device *adev, bool enable) + mutex_unlock(&adev->gfx.gfx_off_mutex); + } + +-int amdgpu_gfx_ras_late_init(struct amdgpu_device *adev, +- void *ras_ih_info) ++int amdgpu_gfx_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 = "gfx_err_count", + .debugfs_name = "gfx_err_inject", + }; +- +- if (!ih_info) +- return -EINVAL; ++ struct ras_ih_if ih_info = { ++ .cb = amdgpu_gfx_process_ras_data_cb, ++ }; + + if (!adev->gfx.ras_if) { + adev->gfx.ras_if = kmalloc(sizeof(struct ras_common_if), GFP_KERNEL); +@@ -593,10 +591,10 @@ int amdgpu_gfx_ras_late_init(struct amdgpu_device *adev, + adev->gfx.ras_if->sub_block_index = 0; + strcpy(adev->gfx.ras_if->name, "gfx"); + } +- fs_info.head = ih_info->head = *adev->gfx.ras_if; ++ fs_info.head = ih_info.head = *adev->gfx.ras_if; + + r = amdgpu_ras_late_init(adev, adev->gfx.ras_if, +- &fs_info, ih_info); ++ &fs_info, &ih_info); + if (r) + goto free; + +@@ -612,7 +610,7 @@ int amdgpu_gfx_ras_late_init(struct amdgpu_device *adev, + + return 0; + late_fini: +- amdgpu_ras_late_fini(adev, adev->gfx.ras_if, ih_info); ++ amdgpu_ras_late_fini(adev, adev->gfx.ras_if, &ih_info); + free: + kfree(adev->gfx.ras_if); + adev->gfx.ras_if = NULL; +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h +index 70a940911724..c5179a807a04 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h +@@ -358,8 +358,7 @@ void amdgpu_gfx_bit_to_me_queue(struct amdgpu_device *adev, int bit, + bool amdgpu_gfx_is_me_queue_enabled(struct amdgpu_device *adev, int me, + int pipe, int queue); + void amdgpu_gfx_off_ctrl(struct amdgpu_device *adev, bool enable); +-int amdgpu_gfx_ras_late_init(struct amdgpu_device *adev, +- void *ras_ih_info); ++int amdgpu_gfx_ras_late_init(struct amdgpu_device *adev); + void amdgpu_gfx_ras_fini(struct amdgpu_device *adev); + int amdgpu_gfx_process_ras_data_cb(struct amdgpu_device *adev, + void *err_data, +diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +index 225b22841f5c..5f7956004627 100644 +--- a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c ++++ b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +@@ -4192,12 +4192,9 @@ static int gfx_v9_0_early_init(void *handle) + static int gfx_v9_0_ecc_late_init(void *handle) + { + struct amdgpu_device *adev = (struct amdgpu_device *)handle; +- struct ras_ih_if ih_info = { +- .cb = amdgpu_gfx_process_ras_data_cb, +- }; + int r; + +- r = amdgpu_gfx_ras_late_init(adev, &ih_info); ++ r = amdgpu_gfx_ras_late_init(adev); + if (r) + return r; + +-- +2.17.1 + |