Skip to contentSkip to conversation

drm/amdgpu: fix warning of drm_mm_clean

PATCH In review ZhenGuo Yin 3 participants 3 messages Apr 8, 2025

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

PATCH 1/1 drm/amdgpu: fix warning of drm_mm_clean

Kernel doorbell BOs needs to be freed before ttm_fini.

Fixes 54c30d2a8def ("drm/amdgpu: create kernel doorbell pages")
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +1 -1
index d4b01ef00025..ff48096c1d80 100644
@@ -3508,6 +3508,7 @@ static int amdgpu_device_ip_fini(struct amdgpu_device *adev)
 			amdgpu_device_mem_scratch_fini(adev);
 			amdgpu_ib_pool_fini(adev);
 			amdgpu_seq64_fini(adev);
+			amdgpu_doorbell_fini(adev);
 		}
 		if (adev->ip_blocks[i].version->funcs->sw_fini) {
 			r = adev->ip_blocks[i].version->funcs->sw_fini(&adev->ip_blocks[i]);
@@ -4851,7 +4852,6 @@ void amdgpu_device_fini_sw(struct amdgpu_device *adev)
 
 		iounmap(adev->rmmio);
 		adev->rmmio = NULL;
-		amdgpu_doorbell_fini(adev);
 		drm_dev_exit(idx);
 	}
 
Signature · 1 line
2.35.1
maintainer
#1 lore raw

Am 08.04.25 um 10:23 schrieb ZhenGuo Yin:

Quoted 4 lines

Kernel doorbell BOs needs to be freed before ttm_fini.

Fixes 54c30d2a8def ("drm/amdgpu: create kernel doorbell pages")

At least from my point that patch seems to make a lot of sense, so feel free to add Reviewed-by: Christian König <[email protected]>.

But I would at least give Alex a chance to take a loop and double check.

Regards,
Christian.

Quoted 24 lines
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +1 -1
index d4b01ef00025..ff48096c1d80 100644
@@ -3508,6 +3508,7 @@ static int amdgpu_device_ip_fini(struct amdgpu_device *adev)
 			amdgpu_device_mem_scratch_fini(adev);
 			amdgpu_ib_pool_fini(adev);
 			amdgpu_seq64_fini(adev);
+			amdgpu_doorbell_fini(adev);
 		}
 		if (adev->ip_blocks[i].version->funcs->sw_fini) {
 			r = adev->ip_blocks[i].version->funcs->sw_fini(&adev->ip_blocks[i]);
@@ -4851,7 +4852,6 @@ void amdgpu_device_fini_sw(struct amdgpu_device *adev)
 
 		iounmap(adev->rmmio);
 		adev->rmmio = NULL;
-		amdgpu_doorbell_fini(adev);
 		drm_dev_exit(idx);
 	}
 
Acked-by
#2 lore raw
Quoted 10 lines · Christian König

Am 08.04.25 um 10:23 schrieb ZhenGuo Yin:

Quoted 4 lines

Kernel doorbell BOs needs to be freed before ttm_fini.

Fixes 54c30d2a8def ("drm/amdgpu: create kernel doorbell pages")

At least from my point that patch seems to make a lot of sense, so feel free to add Reviewed-by: Christian König <[email protected]>.

But I would at least give Alex a chance to take a loop and double check.

Looks correct.

Quoted 29 lines

Regards,
Christian.

Quoted 24 lines
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +1 -1
index d4b01ef00025..ff48096c1d80 100644
@@ -3508,6 +3508,7 @@ static int amdgpu_device_ip_fini(struct amdgpu_device *adev)
                      amdgpu_device_mem_scratch_fini(adev);
                      amdgpu_ib_pool_fini(adev);
                      amdgpu_seq64_fini(adev);
+                     amdgpu_doorbell_fini(adev);
              }
              if (adev->ip_blocks[i].version->funcs->sw_fini) {
                      r = adev->ip_blocks[i].version->funcs->sw_fini(&adev->ip_blocks[i]);
@@ -4851,7 +4852,6 @@ void amdgpu_device_fini_sw(struct amdgpu_device *adev)
 
              iounmap(adev->rmmio);
              adev->rmmio = NULL;
-             amdgpu_doorbell_fini(adev);
              drm_dev_exit(idx);
      }