diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3937-drm-amdgpu-add-common-gfx_ras_fini-function.patch')
-rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3937-drm-amdgpu-add-common-gfx_ras_fini-function.patch | 81 |
1 files changed, 81 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3937-drm-amdgpu-add-common-gfx_ras_fini-function.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3937-drm-amdgpu-add-common-gfx_ras_fini-function.patch new file mode 100644 index 00000000..b1785a8f --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3937-drm-amdgpu-add-common-gfx_ras_fini-function.patch @@ -0,0 +1,81 @@ +From 533ca3e9df21c2e9534799da23c9e660fb8661d2 Mon Sep 17 00:00:00 2001 +From: Tao Zhou <tao.zhou1@amd.com> +Date: Thu, 12 Sep 2019 17:44:49 +0800 +Subject: [PATCH 3937/4256] drm/amdgpu: add common gfx_ras_fini function + +gfx_ras_fini can be shared among all generations of gfx + +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 | 15 +++++++++++++++ + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h | 1 + + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 14 +------------- + 3 files changed, 17 insertions(+), 13 deletions(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c +index e7d87f717737..c0d297acb19c 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c +@@ -619,6 +619,21 @@ int amdgpu_gfx_ras_late_init(struct amdgpu_device *adev, + return r; + } + ++void amdgpu_gfx_ras_fini(struct amdgpu_device *adev) ++{ ++ if (amdgpu_ras_is_supported(adev, AMDGPU_RAS_BLOCK__GFX) && ++ adev->gfx.ras_if) { ++ struct ras_common_if *ras_if = adev->gfx.ras_if; ++ struct ras_ih_if ih_info = { ++ .head = *ras_if, ++ .cb = amdgpu_gfx_process_ras_data_cb, ++ }; ++ ++ amdgpu_ras_late_fini(adev, ras_if, &ih_info); ++ kfree(ras_if); ++ } ++} ++ + int amdgpu_gfx_process_ras_data_cb(struct amdgpu_device *adev, + void *err_data, + struct amdgpu_iv_entry *entry) +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h +index 179dd4e980b7..70a940911724 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h +@@ -360,6 +360,7 @@ bool amdgpu_gfx_is_me_queue_enabled(struct amdgpu_device *adev, int me, + 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); ++void amdgpu_gfx_ras_fini(struct amdgpu_device *adev); + int amdgpu_gfx_process_ras_data_cb(struct amdgpu_device *adev, + void *err_data, + struct amdgpu_iv_entry *entry); +diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +index b238f8b45336..225b22841f5c 100644 +--- a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c ++++ b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +@@ -2129,19 +2129,7 @@ static int gfx_v9_0_sw_fini(void *handle) + int i; + struct amdgpu_device *adev = (struct amdgpu_device *)handle; + +- if (amdgpu_ras_is_supported(adev, AMDGPU_RAS_BLOCK__GFX) && +- adev->gfx.ras_if) { +- struct ras_common_if *ras_if = adev->gfx.ras_if; +- struct ras_ih_if ih_info = { +- .head = *ras_if, +- }; +- +- amdgpu_ras_debugfs_remove(adev, ras_if); +- amdgpu_ras_sysfs_remove(adev, ras_if); +- amdgpu_ras_interrupt_remove_handler(adev, &ih_info); +- amdgpu_ras_feature_enable(adev, ras_if, 0); +- kfree(ras_if); +- } ++ amdgpu_gfx_ras_fini(adev); + + for (i = 0; i < adev->gfx.num_gfx_rings; i++) + amdgpu_ring_fini(&adev->gfx.gfx_ring[i]); +-- +2.17.1 + |