Commit 81ce8bea authored by Rex Zhu's avatar Rex Zhu Committed by Alex Deucher
Browse files

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



Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarRex Zhu <Rex.Zhu@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent e5b03032

drivers/gpu/drm/amd/amdgpu/amdgpu_device.c

+2 −1
Original line number Diff line number Diff line
@@ -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);

drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c

+1 −0
Original line number Diff line number Diff line
@@ -259,6 +259,7 @@ void amdgpu_irq_fini(struct amdgpu_device *adev) 
			}

		}

		kfree(adev->irq.client[i].sources);

		adev->irq.client[i].sources = NULL;

	}

}