[AMD Official Use Only] Reviewed-by: Emily.Deng <[email protected]>
>-----Original Message----- >From: amd-gfx <[email protected]> On Behalf Of >YuBiao Wang >Sent: Thursday, August 5, 2021 10:38 AM >To: [email protected] >Cc: Grodzovsky, Andrey <[email protected]>; Quan, Evan ><[email protected]>; Chen, Horace <[email protected]>; Tuikov, >Luben <[email protected]>; Koenig, Christian ><[email protected]>; Deucher, Alexander ><[email protected]>; Xiao, Jack <[email protected]>; Zhang, >Hawking <[email protected]>; Liu, Monk <[email protected]>; Xu, >Feifei <[email protected]>; Wang, Kevin(Yang) <[email protected]>; >Wang, YuBiao <[email protected]> >Subject: [PATCH] drm/amd/amdgpu: skip locking delayed work if not >initialized. > >When init failed in early init stage, amdgpu_object has not been initialized, >so hasn't the ttm delayed queue functions. > >Signed-off-by: YuBiao Wang <[email protected]> >--- > drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > >diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c >b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c >index 9e53ff851496..4c33985542ed 100644 >--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c >+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c >@@ -3825,7 +3825,8 @@ void amdgpu_device_fini_hw(struct >amdgpu_device *adev) { > dev_info(adev->dev, "amdgpu: finishing device.\n"); > flush_delayed_work(&adev->delayed_init_work); >- ttm_bo_lock_delayed_workqueue(&adev->mman.bdev); >+ if (adev->mman.initialized) >+ ttm_bo_lock_delayed_workqueue(&adev->mman.bdev); > adev->shutdown = true; > > /* make sure IB test finished before entering exclusive mode >-- >2.25.1
