I found a few more paths that cleanup fails due to a NULL version pointer
on unsupported hardware.

Add NULL checks as applicable.

Fixes: 39fc2bc4da00 ("drm/amdgpu: Protect GPU register accesses in powergated 
state in some paths")
Signed-off-by: Mario Limonciello <[email protected]>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c 
b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index 258391ddee7c9..bc6f714e8763a 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -3508,6 +3508,8 @@ static int amdgpu_device_ip_fini_early(struct 
amdgpu_device *adev)
        int i, r;
 
        for (i = 0; i < adev->num_ip_blocks; i++) {
+               if (!adev->ip_blocks[i].version)
+                       continue;
                if (!adev->ip_blocks[i].version->funcs->early_fini)
                        continue;
 
@@ -3585,6 +3587,8 @@ static int amdgpu_device_ip_fini(struct amdgpu_device 
*adev)
                if (!adev->ip_blocks[i].status.sw)
                        continue;
 
+               if (!adev->ip_blocks[i].version)
+                       continue;
                if (adev->ip_blocks[i].version->type == AMD_IP_BLOCK_TYPE_GMC) {
                        amdgpu_ucode_free_bo(adev);
                        amdgpu_free_static_csa(&adev->virt.csa_obj);
@@ -3611,6 +3615,8 @@ static int amdgpu_device_ip_fini(struct amdgpu_device 
*adev)
        for (i = adev->num_ip_blocks - 1; i >= 0; i--) {
                if (!adev->ip_blocks[i].status.late_initialized)
                        continue;
+               if (!adev->ip_blocks[i].version)
+                       continue;
                if (adev->ip_blocks[i].version->funcs->late_fini)
                        
adev->ip_blocks[i].version->funcs->late_fini(&adev->ip_blocks[i]);
                adev->ip_blocks[i].status.late_initialized = false;
-- 
2.53.0

Reply via email to