drm/amdgpu: also track late init state
Subsystems (2)
PATCH 1/1 drm/amdgpu: also track late init state
Successful sw_init() and hw_init() states are tracked, but not late_init(). Various error paths may result in amdgpu_fini() being called before .late init is done, so late_init needs to be tracked to avoid unexpected or multiple .late_fini() calls.
--- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 4 ++++ 2 files changed, 5 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu.h +1 -0
@@ -1943,6 +1943,7 @@ struct amdgpu_ip_block_status {bool valid;bool sw;bool hw; +bool late_initialized;bool hang; };
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +4 -0
@@ -1450,6 +1450,7 @@ static int amdgpu_late_init(struct amdgpu_device *adev)DRM_ERROR ("late_init of IP block <%s> failed %d\n" , adev->ip_blocks[i].funcs->name, r);return r; } + adev->ip_block_status[i].late_initialized = true; } }
@@ -1495,8 +1496,11 @@ static int amdgpu_fini(struct amdgpu_device *adev) }for (i = adev->num_ip_blocks -1 ; i >=0 ; i--) { +if (!adev->ip_block_status[i].late_initialized) +continue ;if (adev->ip_blocks[i].funcs->late_fini) adev->ip_blocks[i].funcs->late_fini ((void *)adev); + adev->ip_block_status[i].late_initialized = false; }return 0 ;
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Alex Deucher
AppliedQuoted 6 lines · Grazvydas Ignotas
Successful
sw_init()andhw_init()states are tracked, but notlate_init(). Various error paths may result inamdgpu_fini()being called before .late init is done, solate_initneeds to be tracked to avoid unexpected or multiple .late_fini() calls.Signed-off-by Grazvydas Ignotas <[email protected]>
Applied. thanks!
Alex
Quoted 44 lines
--- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 4 ++++ 2 files changed, 5 insertions(+)drivers/gpu/drm/amd/amdgpu/amdgpu.h +1
-0@@ -1943,6 +1943,7 @@ struct amdgpu_ip_block_status {bool valid;bool sw;bool hw; +bool late_initialized;bool hang; };drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +4
-1@@ -1450,6 +1450,7 @@ static int amdgpu_late_init(struct amdgpu_device *adev)DRM_ERROR ("late_init of IP block <%s> failed %d\n" , adev->ip_blocks[i].funcs->name, r);return r; } + adev->ip_block_status[i].late_initialized = true; } }@@ -1495,8 +1496,11 @@ static int amdgpu_fini(struct amdgpu_device *adev) }for (i = adev->num_ip_blocks -1 ; i >=0 ; i--) { +if (!adev->ip_block_status[i].late_initialized) +continue ;if (adev->ip_blocks[i].funcs->late_fini) adev->ip_blocks[i].funcs->late_fini ((void *)adev); + adev->ip_block_status[i].late_initialized = false; }return 0 ; --2.7.4
Quoted 4 lines
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel