Re: [PATCH] drm/amdgpu: check sdma ras funcs pointer before accessing

["Das, Nirmoy" <Nirmoy.Das@xxxxxxx>]

[AMD Official Use Only - Internal Distribution Only]

I just got hit by this bug.

Reviewed-by: Nirmoy Das <nirmoy.das@amd.com>

Thanks, 

Nirmoy 

---

From: amd-gfx <amd-gfx-bounces@xxxxxxxxxxxxxxxxxxxxx> on behalf of Hawking Zhang <Hawking.Zhang@xxxxxxx>
Sent: Thursday, January 9, 2020 12:42:13 PM
To: amd-gfx@xxxxxxxxxxxxxxxxxxxxx <amd-gfx@xxxxxxxxxxxxxxxxxxxxx>
Cc: Zhang, Hawking <Hawking.Zhang@xxxxxxx>
Subject: [PATCH] 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 <Hawking.Zhang@xxxxxxx>
---
 drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
index f4107f9b75f3..c4b4caaf56fe 100644
--- a/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
@@ -1810,7 +1810,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)
@@ -1882,7 +1885,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);
--
2.17.1

_______________________________________________
amd-gfx mailing list
amd-gfx@xxxxxxxxxxxxxxxxxxxxx
https://nam11.safelinks.protection.outlook.com/?url="">

_______________________________________________
amd-gfx mailing list
amd-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/amd-gfx