diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3938-drm-amdgpu-add-common-sdma_ras_fini-function.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3938-drm-amdgpu-add-common-sdma_ras_fini-function.patch | 87 |
1 files changed, 87 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3938-drm-amdgpu-add-common-sdma_ras_fini-function.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3938-drm-amdgpu-add-common-sdma_ras_fini-function.patch new file mode 100644 index 00000000..e8ca8718 --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3938-drm-amdgpu-add-common-sdma_ras_fini-function.patch @@ -0,0 +1,87 @@ +From 48cb5693e7d60df67c59e78075d644492d72397b Mon Sep 17 00:00:00 2001 +From: Tao Zhou <tao.zhou1@amd.com> +Date: Thu, 12 Sep 2019 18:19:02 +0800 +Subject: [PATCH 3938/4256] drm/amdgpu: add common sdma_ras_fini function + +sdma_ras_fini can be shared among all generations of sdma + +Signed-off-by: Tao Zhou <tao.zhou1@amd.com> +Reviewed-by: Guchun Chen <guchun.chen@amd.com> +--- + drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c | 19 +++++++++++++++++++ + drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.h | 1 + + drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 16 +--------------- + 3 files changed, 21 insertions(+), 15 deletions(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c +index b294157c1deb..6361b2c9ae1a 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c +@@ -136,6 +136,25 @@ int amdgpu_sdma_ras_late_init(struct amdgpu_device *adev, + return r; + } + ++void amdgpu_sdma_ras_fini(struct amdgpu_device *adev) ++{ ++ if (amdgpu_ras_is_supported(adev, AMDGPU_RAS_BLOCK__SDMA) && ++ adev->sdma.ras_if) { ++ struct ras_common_if *ras_if = adev->sdma.ras_if; ++ struct ras_ih_if ih_info = { ++ .head = *ras_if, ++ /* the cb member will not be used by ++ * amdgpu_ras_interrupt_remove_handler, init it only ++ * to cheat the check in ras_late_fini ++ */ ++ .cb = amdgpu_sdma_process_ras_data_cb, ++ }; ++ ++ amdgpu_ras_late_fini(adev, ras_if, &ih_info); ++ kfree(ras_if); ++ } ++} ++ + int amdgpu_sdma_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_sdma.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.h +index 95e01d522537..761ff8be6314 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.h ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.h +@@ -106,6 +106,7 @@ int amdgpu_sdma_get_index_from_ring(struct amdgpu_ring *ring, uint32_t *index); + uint64_t amdgpu_sdma_get_csa_mc_addr(struct amdgpu_ring *ring, unsigned vmid); + int amdgpu_sdma_ras_late_init(struct amdgpu_device *adev, + void *ras_ih_info); ++void amdgpu_sdma_ras_fini(struct amdgpu_device *adev); + int amdgpu_sdma_process_ras_data_cb(struct amdgpu_device *adev, + void *err_data, + struct amdgpu_iv_entry *entry); +diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c +index 2ce0ecce145f..1dac74c441bb 100644 +--- a/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c ++++ b/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c +@@ -1771,21 +1771,7 @@ static int sdma_v4_0_sw_fini(void *handle) + struct amdgpu_device *adev = (struct amdgpu_device *)handle; + int i; + +- if (amdgpu_ras_is_supported(adev, AMDGPU_RAS_BLOCK__SDMA) && +- adev->sdma.ras_if) { +- struct ras_common_if *ras_if = adev->sdma.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); +- } ++ amdgpu_sdma_ras_fini(adev); + + for (i = 0; i < adev->sdma.num_instances; i++) { + amdgpu_ring_fini(&adev->sdma.instance[i].ring); +-- +2.17.1 + |