drm/amdgpu: Fix kernel NULL pointer dereference when amdgpu fini

Reviewed-by: Alex Deucher <[email protected]>
Signed-off-by: Rex Zhu <[email protected]>
Signed-off-by: Alex Deucher <[email protected]>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index 4fa869b1a9cb68f33178115699f10c7cc0362fda..a824d5d2ebbed73e3176009e0d0dcc5d5f008e5d 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -1752,7 +1752,8 @@ static int amdgpu_device_ip_fini(struct amdgpu_device *adev)
                        continue;
 
                if (adev->ip_blocks[i].version->type != AMD_IP_BLOCK_TYPE_UVD &&
-                       adev->ip_blocks[i].version->type != AMD_IP_BLOCK_TYPE_VCE) {
+                       adev->ip_blocks[i].version->type != AMD_IP_BLOCK_TYPE_VCE &&
+                       adev->ip_blocks[i].version->funcs->set_clockgating_state) {
                        /* ungate blocks before hw fini so that we can shutdown the blocks safely */
                        r = adev->ip_blocks[i].version->funcs->set_clockgating_state((void *)adev,
                                                                                     AMD_CG_STATE_UNGATE);

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c
index 11dfe57bd8bbb32eed0152c4055b5f4488bdab7a..3a5ca462abf093457381bcaeae1a8e7ecb90b33e 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c
@@ -259,6 +259,7 @@ void amdgpu_irq_fini(struct amdgpu_device *adev)
                        }
                }
                kfree(adev->irq.client[i].sources);
+               adev->irq.client[i].sources = NULL;
        }
 }