drm/amdgpu: put cancel dealyed work at first
Subsystems (2)
PATCH 1/1 drm/amdgpu: put cancel dealyed work at first
There is one regression from 042f3d7b745cd76aa and one improvement here.
-regression:
put flush_delayed_work after adev->shutdown = true which will make amdgpu_ih_process not response the irq At last, all ib ring tests will be failed just like below
[drm] amdgpu: finishing device.
[drm] Fence fallback timer expired on ring gfx
[drm] Fence fallback timer expired on ring comp_1.0.0
[drm] Fence fallback timer expired on ring comp_1.1.0
[drm] Fence fallback timer expired on ring comp_1.2.0
[drm] Fence fallback timer expired on ring comp_1.3.0
[drm] Fence fallback timer expired on ring comp_1.0.1
amdgpu 0000:00:07.0: [drm:amdgpu_ib_ring_tests [amdgpu]] *ERROR* IB test failed on comp_1.1.1 (-110). amdgpu 0000:00:07.0: [drm:amdgpu_ib_ring_tests [amdgpu]] *ERROR* IB test failed on comp_1.2.1 (-110). amdgpu 0000:00:07.0: [drm:amdgpu_ib_ring_tests [amdgpu]] *ERROR* IB test failed on comp_1.3.1 (-110). amdgpu 0000:00:07.0: [drm:amdgpu_ib_ring_tests [amdgpu]] *ERROR* IB test failed on sdma0 (-110). amdgpu 0000:00:07.0: [drm:amdgpu_ib_ring_tests [amdgpu]] *ERROR* IB test failed on sdma1 (-110). amdgpu 0000:00:07.0: [drm:amdgpu_ib_ring_tests [amdgpu]] *ERROR* IB test failed on uvd_enc_0.0 (-110). amdgpu 0000:00:07.0: [drm:amdgpu_ib_ring_tests [amdgpu]] *ERROR* IB test failed on vce0 (-110). [drm:amdgpu_device_delayed_init_work_handler [amdgpu]] *ERROR* ib ring test failed (-110).
-improvement:
In fact, there is cancel_delayed_work_sync in this fucntion So there is no need to invoke flush_delayed_work before cancel_delayed_work_sync. Just put cancel at first
--- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +1 -3
@@ -3109,10 +3109,9 @@ void amdgpu_device_fini(struct amdgpu_device *adev)int r;DRM_INFO ("amdgpu: finishing device.\n" ); +cancel_delayed_work_sync (&adev->delayed_init_work); adev->shutdown = true; -flush_delayed_work (&adev->delayed_init_work); -/* disable all interrupts */ amdgpu_irq_disable_all (adev);if (adev->mode_info.mode_config_initialized){
@@ -3130,7 +3129,6 @@ void amdgpu_device_fini(struct amdgpu_device *adev) adev->firmware.gpu_info_fw =NULL ; } adev->accel_working = false; -cancel_delayed_work_sync (&adev->delayed_init_work);/* free i2c buses */ if (!amdgpu_device_has_dc_support (adev))amdgpu_i2c_fini (adev);
Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): [email protected]
Good catch, but I would still prefer to use flush_delayed_work() instead of canceling it.
Regards,
Christian.
Am 18.11.19 um 09:21 schrieb Yintian Tao:
Quoted 50 lines
There is one regression from
042f3d7b745cd76aaand one improvement here.
-regression:
putflush_delayed_workafteradev->shutdown= true which will makeamdgpu_ih_processnot response the irq At last, all ib ring tests will be failed just like below[drm] amdgpu: finishing device.
[drm] Fence fallback timer expired on ring gfx
[drm] Fence fallback timer expired on ring comp_1.0.0
[drm] Fence fallback timer expired on ring comp_1.1.0
[drm] Fence fallback timer expired on ring comp_1.2.0
[drm] Fence fallback timer expired on ring comp_1.3.0
[drm] Fence fallback timer expired on ring comp_1.0.1
amdgpu 0000:00:07.0: [drm:amdgpu_ib_ring_tests [amdgpu]] *ERROR* IB test failed on comp_1.1.1 (-110). amdgpu 0000:00:07.0: [drm:amdgpu_ib_ring_tests [amdgpu]] *ERROR* IB test failed on comp_1.2.1 (-110). amdgpu 0000:00:07.0: [drm:amdgpu_ib_ring_tests [amdgpu]] *ERROR* IB test failed on comp_1.3.1 (-110). amdgpu 0000:00:07.0: [drm:amdgpu_ib_ring_tests [amdgpu]] *ERROR* IB test failed on sdma0 (-110). amdgpu 0000:00:07.0: [drm:amdgpu_ib_ring_tests [amdgpu]] *ERROR* IB test failed on sdma1 (-110). amdgpu 0000:00:07.0: [drm:amdgpu_ib_ring_tests [amdgpu]] *ERROR* IB test failed on uvd_enc_0.0 (-110). amdgpu 0000:00:07.0: [drm:amdgpu_ib_ring_tests [amdgpu]] *ERROR* IB test failed on vce0 (-110). [drm:amdgpu_device_delayed_init_work_handler [amdgpu]] *ERROR* ib ring test failed (-110).-improvement:
In fact, there iscancel_delayed_work_syncin this fucntion So there is no need to invokeflush_delayed_workbeforecancel_delayed_work_sync. Just put cancel at firstSigned-off-by Yintian Tao <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +1
-2@@ -3109,10 +3109,9 @@ void amdgpu_device_fini(struct amdgpu_device *adev)int r;DRM_INFO ("amdgpu: finishing device.\n" ); +cancel_delayed_work_sync (&adev->delayed_init_work); adev->shutdown = true; -flush_delayed_work (&adev->delayed_init_work); -/* disable all interrupts */ amdgpu_irq_disable_all (adev);if (adev->mode_info.mode_config_initialized){
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c void amdgpu_device_fini(struct amdgpu_device *adev) · line 3134
Quoted 7 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +0
-1@@ -3130,7 +3129,6 @@ void amdgpu_device_fini(struct amdgpu_device *adev) adev->firmware.gpu_info_fw =NULL ; } adev->accel_working = false; -cancel_delayed_work_sync (&adev->delayed_init_work);/* free i2c buses */ if (!amdgpu_device_has_dc_support (adev))amdgpu_i2c_fini (adev);
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 03d55ea8-8825-c65a-7193-9a0f11776595-5C7GfCeVMHo@public.gmane.org
Hi Christian
Thanks, I got it, I will use flush_delayed_work to replace canceling.
Best Regards
Yintian Tao
-----Original Message-----
From: Koenig, Christian <[email protected]>
Sent: 2019年11月18日 19:32
To: Tao, Yintian <[email protected]>
Cc: [email protected]
Subject: Re: [PATCH] drm/amdgpu: put cancel dealyed work at first
Good catch, but I would still prefer to use flush_delayed_work() instead of canceling it.
Regards,
Christian.
Am 18.11.19 um 09:21 schrieb Yintian Tao:
Quoted 50 lines
There is one regression from
042f3d7b745cd76aaand one improvement here.
-regression:
putflush_delayed_workafteradev->shutdown= true which will makeamdgpu_ih_processnot response the irq At last, all ib ring tests will be failed just like below[drm] amdgpu: finishing device.
[drm] Fence fallback timer expired on ring gfx [drm] Fence fallback
timer expired on ring comp_1.0.0 [drm] Fence fallback timer expired on
ring comp_1.1.0 [drm] Fence fallback timer expired on ring comp_1.2.0
[drm] Fence fallback timer expired on ring comp_1.3.0 [drm] Fence
fallback timer expired on ring comp_1.0.1 amdgpu 0000:00:07.0:
[drm:amdgpu_ib_ring_tests [amdgpu]] *ERROR* IB test failed on comp_1.1.1 (-110). amdgpu 0000:00:07.0: [drm:amdgpu_ib_ring_tests [amdgpu]] *ERROR* IB test failed on comp_1.2.1 (-110). amdgpu 0000:00:07.0: [drm:amdgpu_ib_ring_tests [amdgpu]] *ERROR* IB test failed on comp_1.3.1 (-110). amdgpu 0000:00:07.0: [drm:amdgpu_ib_ring_tests [amdgpu]] *ERROR* IB test failed on sdma0 (-110). amdgpu 0000:00:07.0: [drm:amdgpu_ib_ring_tests [amdgpu]] *ERROR* IB test failed on sdma1 (-110). amdgpu 0000:00:07.0: [drm:amdgpu_ib_ring_tests [amdgpu]] *ERROR* IB test failed on uvd_enc_0.0 (-110). amdgpu 0000:00:07.0: [drm:amdgpu_ib_ring_tests [amdgpu]] *ERROR* IB test failed on vce0 (-110). [drm:amdgpu_device_delayed_init_work_handler [amdgpu]] *ERROR* ib ring test failed (-110).-improvement:
In fact, there iscancel_delayed_work_syncin this fucntion So there is no need to invokeflush_delayed_workbeforecancel_delayed_work_sync. Just put cancel at firstSigned-off-by Yintian Tao <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +1
-2@@ -3109,10 +3109,9 @@ void amdgpu_device_fini(struct amdgpu_device *adev)int r;DRM_INFO ("amdgpu: finishing device.\n" ); +cancel_delayed_work_sync (&adev->delayed_init_work); adev->shutdown = true; -flush_delayed_work (&adev->delayed_init_work); -/* disable all interrupts */ amdgpu_irq_disable_all (adev);if (adev->mode_info.mode_config_initialized){
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c void amdgpu_device_fini(struct amdgpu_device *adev) · line 3134
Quoted 7 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +0
-1@@ -3130,7 +3129,6 @@ void amdgpu_device_fini(struct amdgpu_device *adev) adev->firmware.gpu_info_fw =NULL ; } adev->accel_working = false; -cancel_delayed_work_sync (&adev->delayed_init_work);/* free i2c buses */ if (!amdgpu_device_has_dc_support (adev))amdgpu_i2c_fini (adev);
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx