aboutsummaryrefslogtreecommitdiffstats
path: root/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3936-drm-amdgpu-add-common-gmc_ras_fini-function.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3936-drm-amdgpu-add-common-gmc_ras_fini-function.patch')
-rw-r--r--meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3936-drm-amdgpu-add-common-gmc_ras_fini-function.patch102
1 files changed, 102 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3936-drm-amdgpu-add-common-gmc_ras_fini-function.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3936-drm-amdgpu-add-common-gmc_ras_fini-function.patch
new file mode 100644
index 00000000..ef49fa79
--- /dev/null
+++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3936-drm-amdgpu-add-common-gmc_ras_fini-function.patch
@@ -0,0 +1,102 @@
+From a088ac456990448e69dbb43b00e7aa17e7afe5af Mon Sep 17 00:00:00 2001
+From: Tao Zhou <tao.zhou1@amd.com>
+Date: Thu, 12 Sep 2019 17:39:47 +0800
+Subject: [PATCH 3936/4256] drm/amdgpu: add common gmc_ras_fini function
+
+gmc_ras_fini can be shared among all generations of gmc
+
+Signed-off-by: Tao Zhou <tao.zhou1@amd.com>
+Reviewed-by: Guchun Chen <guchun.chen@amd.com>
+---
+ drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 26 +++++++++++++++++++++++
+ drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h | 1 +
+ drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 28 +------------------------
+ 3 files changed, 28 insertions(+), 27 deletions(-)
+
+diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c
+index dc044eec188e..58a95a67336a 100644
+--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c
++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c
+@@ -304,3 +304,29 @@ bool amdgpu_gmc_filter_faults(struct amdgpu_device *adev, uint64_t addr,
+ gmc->fault_hash[hash].idx = gmc->last_fault++;
+ return false;
+ }
++
++void amdgpu_gmc_ras_fini(struct amdgpu_device *adev)
++{
++ if (amdgpu_ras_is_supported(adev, AMDGPU_RAS_BLOCK__UMC) &&
++ adev->umc.ras_if) {
++ struct ras_common_if *ras_if = adev->umc.ras_if;
++ struct ras_ih_if ih_info = {
++ .head = *ras_if,
++ .cb = amdgpu_umc_process_ras_data_cb,
++ };
++
++ amdgpu_ras_late_fini(adev, ras_if, &ih_info);
++ kfree(ras_if);
++ }
++
++ if (amdgpu_ras_is_supported(adev, AMDGPU_RAS_BLOCK__MMHUB) &&
++ adev->mmhub.ras_if) {
++ struct ras_common_if *ras_if = adev->mmhub.ras_if;
++ struct ras_ih_if ih_info = {
++ .cb = NULL,
++ };
++
++ amdgpu_ras_late_fini(adev, ras_if, &ih_info);
++ kfree(ras_if);
++ }
++}
+diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h
+index a0c04f1fb256..9dd9c47cb47d 100644
+--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h
++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h
+@@ -233,5 +233,6 @@ void amdgpu_gmc_agp_location(struct amdgpu_device *adev,
+ struct amdgpu_gmc *mc);
+ bool amdgpu_gmc_filter_faults(struct amdgpu_device *adev, uint64_t addr,
+ uint16_t pasid, uint64_t timestamp);
++void amdgpu_gmc_ras_fini(struct amdgpu_device *adev);
+
+ #endif
+diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
+index 06f2d073db55..6570c3f41bf2 100644
+--- a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
++++ b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
+@@ -1118,33 +1118,7 @@ static int gmc_v9_0_sw_fini(void *handle)
+ struct amdgpu_device *adev = (struct amdgpu_device *)handle;
+ void *stolen_vga_buf;
+
+- if (amdgpu_ras_is_supported(adev, AMDGPU_RAS_BLOCK__UMC) &&
+- adev->umc.ras_if) {
+- struct ras_common_if *ras_if = adev->umc.ras_if;
+- struct ras_ih_if ih_info = {
+- .head = *ras_if,
+- };
+-
+- /* remove fs first */
+- amdgpu_ras_debugfs_remove(adev, ras_if);
+- amdgpu_ras_sysfs_remove(adev, ras_if);
+- /* remove the IH */
+- amdgpu_ras_interrupt_remove_handler(adev, &ih_info);
+- amdgpu_ras_feature_enable(adev, ras_if, 0);
+- kfree(ras_if);
+- }
+-
+- if (amdgpu_ras_is_supported(adev, AMDGPU_RAS_BLOCK__MMHUB) &&
+- adev->mmhub.ras_if) {
+- struct ras_common_if *ras_if = adev->mmhub.ras_if;
+-
+- /* remove fs and disable ras feature */
+- amdgpu_ras_debugfs_remove(adev, ras_if);
+- amdgpu_ras_sysfs_remove(adev, ras_if);
+- amdgpu_ras_feature_enable(adev, ras_if, 0);
+- kfree(ras_if);
+- }
+-
++ amdgpu_gmc_ras_fini(adev);
+ amdgpu_gem_force_release(adev);
+ amdgpu_vm_manager_fini(adev);
+
+--
+2.17.1
+