From: Hawking Zhang Date: Thu, 9 Jan 2020 11:38:25 +0000 (+0800) Subject: drm/amdgpu: check sdma ras funcs pointer before accessing X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=49da2ccd2d6e449b1a5cefd2b3f90e4d9a5c1adb;p=linux.git drm/amdgpu: check sdma ras funcs pointer before accessing sdma ras funcs are not supported by ASIC prior to vega20 Signed-off-by: Hawking Zhang Reviewed-by: Le Ma Signed-off-by: Alex Deucher --- diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c index ec9d7873ed421..5d9597f5ac5fc 100644 --- a/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c +++ b/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c @@ -1809,7 +1809,10 @@ static int sdma_v4_0_late_init(void *handle) RREG32_SDMA(i, mmSDMA0_EDC_COUNTER); } - return adev->sdma.funcs->ras_late_init(adev, &ih_info); + if (adev->sdma.funcs && adev->sdma.funcs->ras_late_init) + return adev->sdma.funcs->ras_late_init(adev, &ih_info); + else + return 0; } static int sdma_v4_0_sw_init(void *handle) @@ -1881,7 +1884,8 @@ static int sdma_v4_0_sw_fini(void *handle) struct amdgpu_device *adev = (struct amdgpu_device *)handle; int i; - adev->sdma.funcs->ras_fini(adev); + if (adev->sdma.funcs && adev->sdma.funcs->ras_fini) + adev->sdma.funcs->ras_fini(adev); for (i = 0; i < adev->sdma.num_instances; i++) { amdgpu_ring_fini(&adev->sdma.instance[i].ring);