Skip to contentSkip to conversation

drm/amdgpu: remove obsolete gmc ras helpers

PATCH In review Hawking Zhang 2 participants 2 messages Jul 29

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/amdgpu: remove obsolete gmc ras helpers

Remove the obsolete gmc ras helpers including
amdgpu_gmc_ras_late_init and amdgpu_gmc_ras_fini
and their declarations, and call sites.

---
 drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 10 ----------
 drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h |  2 --
 drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c  |  4 ----
 drivers/gpu/drm/amd/amdgpu/gmc_v11_0.c  |  4 ----
 drivers/gpu/drm/amd/amdgpu/gmc_v12_0.c  |  4 ----
 drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c   |  5 -----
 6 files changed, 29 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c +0 -10
index 3da50132c5d0..3dc8faa091d7 100644
@@ -628,16 +628,6 @@ int amdgpu_gmc_ras_sw_init(struct amdgpu_device *adev)
 		return r;
 
 	return 0;
-}
-
-int amdgpu_gmc_ras_late_init(struct amdgpu_device *adev)
-{
-	return 0;
-}
-
-void amdgpu_gmc_ras_fini(struct amdgpu_device *adev)
-{
-
 }
 
 	/*
drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h +0 -2
index 3ca187f5ade8..c0884797dd54 100644
@@ -438,8 +438,6 @@ int amdgpu_gmc_handle_retry_fault(struct amdgpu_device *adev,
 				  u32 node_id,
 				  bool write_fault);
 int amdgpu_gmc_ras_sw_init(struct amdgpu_device *adev);
-int amdgpu_gmc_ras_late_init(struct amdgpu_device *adev);
-void amdgpu_gmc_ras_fini(struct amdgpu_device *adev);
 int amdgpu_gmc_allocate_vm_inv_eng(struct amdgpu_device *adev);
 void amdgpu_gmc_flush_gpu_tlb(struct amdgpu_device *adev, uint32_t vmid,
 			      uint32_t vmhub, uint32_t flush_type);
drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c +0 -4
index 6be2000c8261..c70657bc089b 100644
@@ -640,10 +640,6 @@ static int gmc_v10_0_late_init(struct amdgpu_ip_block *ip_block)
 	if (r)
 		return r;
 
-	r = amdgpu_gmc_ras_late_init(adev);
-	if (r)
-		return r;
-
 	return amdgpu_irq_get(adev, &adev->gmc.vm_fault, 0);
 }
 
drivers/gpu/drm/amd/amdgpu/gmc_v11_0.c +0 -4
index c40d9c467204..7e612f947349 100644
@@ -646,10 +646,6 @@ static int gmc_v11_0_late_init(struct amdgpu_ip_block *ip_block)
 	if (r)
 		return r;
 
-	r = amdgpu_gmc_ras_late_init(adev);
-	if (r)
-		return r;
-
 	return amdgpu_irq_get(adev, &adev->gmc.vm_fault, 0);
 }
 
drivers/gpu/drm/amd/amdgpu/gmc_v12_0.c +0 -4
index 84c93364d220..b05465dc30b4 100644
@@ -682,10 +682,6 @@ static int gmc_v12_0_late_init(struct amdgpu_ip_block *ip_block)
 	if (r)
 		return r;
 
-	r = amdgpu_gmc_ras_late_init(adev);
-	if (r)
-		return r;
-
 	return amdgpu_irq_get(adev, &adev->gmc.vm_fault, 0);
 }
 
drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c +0 -5
index 1fcc0594fd0a..119268273530 100644
@@ -1640,10 +1640,6 @@ static int gmc_v9_0_late_init(struct amdgpu_ip_block *ip_block)
 		amdgpu_ras_reset_error_count(adev, AMDGPU_RAS_BLOCK__HDP);
 	}
 
-	r = amdgpu_gmc_ras_late_init(adev);
-	if (r)
-		return r;
-
 	return amdgpu_irq_get(adev, &adev->gmc.vm_fault, 0);
 }
 
@@ -2063,7 +2059,6 @@ static int gmc_v9_0_sw_fini(struct amdgpu_ip_block *ip_block)
 	if (amdgpu_is_multi_aid(adev))
 		amdgpu_gmc_sysfs_fini(adev);
 
-	amdgpu_gmc_ras_fini(adev);
 	amdgpu_gem_force_release(adev);
 	amdgpu_vm_manager_fini(adev);
 	if (!adev->gmc.real_vram_size) {
Signature · 1 line
2.17.1
Reviewed-by Ce Sun on v1 1/1
#1 lore raw

AMD General

Hi Hawking,

The patch looks good to me.

Thanks,
Ce Sun

获取 Outlook for iOS<https://aka.ms/o0ukef>
________________________________
发件人: Zhang, Hawking <[email protected]>
发送时间: Wednesday, 29 July 2026 15:29:06
收件人: [email protected] <[email protected]>; Zhou1, Tao <[email protected]>; Sun, Ce(Overlord) <[email protected]> 抄送: Zhang, Hawking <[email protected]>
主题: [PATCH] drm/amdgpu: remove obsolete gmc ras helpers

Remove the obsolete gmc ras helpers including
amdgpu_gmc_ras_late_init and amdgpu_gmc_ras_fini
and their declarations, and call sites.

---
 drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 10 ----------
 drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h |  2 --
 drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c  |  4 ----
 drivers/gpu/drm/amd/amdgpu/gmc_v11_0.c  |  4 ----
 drivers/gpu/drm/amd/amdgpu/gmc_v12_0.c  |  4 ----
 drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c   |  5 -----
 6 files changed, 29 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c +0 -10
index 3da50132c5d0..3dc8faa091d7 100644
@@ -628,16 +628,6 @@ int amdgpu_gmc_ras_sw_init(struct amdgpu_device *adev)
                 return r;
 
         return 0;
-}
-
-int amdgpu_gmc_ras_late_init(struct amdgpu_device *adev)
-{
-       return 0;
-}
-
-void amdgpu_gmc_ras_fini(struct amdgpu_device *adev)
-{
-
 }
 
         /*
drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h +0 -2
index 3ca187f5ade8..c0884797dd54 100644
@@ -438,8 +438,6 @@ int amdgpu_gmc_handle_retry_fault(struct amdgpu_device *adev,
                                   u32 node_id,
                                   bool write_fault);
 int amdgpu_gmc_ras_sw_init(struct amdgpu_device *adev);
-int amdgpu_gmc_ras_late_init(struct amdgpu_device *adev);
-void amdgpu_gmc_ras_fini(struct amdgpu_device *adev);
 int amdgpu_gmc_allocate_vm_inv_eng(struct amdgpu_device *adev);
 void amdgpu_gmc_flush_gpu_tlb(struct amdgpu_device *adev, uint32_t vmid,
                               uint32_t vmhub, uint32_t flush_type);
drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c +0 -4
index 6be2000c8261..c70657bc089b 100644
@@ -640,10 +640,6 @@ static int gmc_v10_0_late_init(struct amdgpu_ip_block *ip_block)
         if (r)
                 return r;
 
-       r = amdgpu_gmc_ras_late_init(adev);
-       if (r)
-               return r;
-
         return amdgpu_irq_get(adev, &adev->gmc.vm_fault, 0);
 }
 
drivers/gpu/drm/amd/amdgpu/gmc_v11_0.c +0 -4
index c40d9c467204..7e612f947349 100644
@@ -646,10 +646,6 @@ static int gmc_v11_0_late_init(struct amdgpu_ip_block *ip_block)
         if (r)
                 return r;
 
-       r = amdgpu_gmc_ras_late_init(adev);
-       if (r)
-               return r;
-
         return amdgpu_irq_get(adev, &adev->gmc.vm_fault, 0);
 }
 
drivers/gpu/drm/amd/amdgpu/gmc_v12_0.c +0 -4
index 84c93364d220..b05465dc30b4 100644
@@ -682,10 +682,6 @@ static int gmc_v12_0_late_init(struct amdgpu_ip_block *ip_block)
         if (r)
                 return r;
 
-       r = amdgpu_gmc_ras_late_init(adev);
-       if (r)
-               return r;
-
         return amdgpu_irq_get(adev, &adev->gmc.vm_fault, 0);
 }
 
drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c +0 -5
index 1fcc0594fd0a..119268273530 100644
@@ -1640,10 +1640,6 @@ static int gmc_v9_0_late_init(struct amdgpu_ip_block *ip_block)
                 amdgpu_ras_reset_error_count(adev, AMDGPU_RAS_BLOCK__HDP);
         }
 
-       r = amdgpu_gmc_ras_late_init(adev);
-       if (r)
-               return r;
-
         return amdgpu_irq_get(adev, &adev->gmc.vm_fault, 0);
 }
 
@@ -2063,7 +2059,6 @@ static int gmc_v9_0_sw_fini(struct amdgpu_ip_block *ip_block)
         if (amdgpu_is_multi_aid(adev))
                 amdgpu_gmc_sysfs_fini(adev);
 
-       amdgpu_gmc_ras_fini(adev);
         amdgpu_gem_force_release(adev);
         amdgpu_vm_manager_fini(adev);
         if (!adev->gmc.real_vram_size) {

--
2.17.1