* [PATCH] drm/amdgpu: put cancel dealyed work at first
@ 2019-11-18 8:21 ` Yintian Tao
0 siblings, 0 replies; 6+ messages in thread
From: Yintian Tao @ 2019-11-18 8:21 UTC (permalink / raw)
To: christian.koenig-5C7GfCeVMHo
Cc: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW, Yintian Tao
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
Signed-off-by: Yintian Tao <yttao@amd.com>
---
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index 17be6389adf7..a2454c3efc65 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -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);
--
2.17.1
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH] drm/amdgpu: put cancel dealyed work at first
@ 2019-11-18 8:21 ` Yintian Tao
0 siblings, 0 replies; 6+ messages in thread
From: Yintian Tao @ 2019-11-18 8:21 UTC (permalink / raw)
To: christian.koenig; +Cc: amd-gfx, Yintian Tao
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
Signed-off-by: Yintian Tao <yttao@amd.com>
---
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index 17be6389adf7..a2454c3efc65 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -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);
--
2.17.1
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply related [flat|nested] 6+ messages in thread[parent not found: <20191118082149.16712-1-yttao-5C7GfCeVMHo@public.gmane.org>]
* Re: [PATCH] drm/amdgpu: put cancel dealyed work at first
@ 2019-11-18 11:32 ` Christian König
0 siblings, 0 replies; 6+ messages in thread
From: Christian König @ 2019-11-18 11:32 UTC (permalink / raw)
To: Yintian Tao; +Cc: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW
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:
> 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
>
> Signed-off-by: Yintian Tao <yttao@amd.com>
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 4 +---
> 1 file changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> index 17be6389adf7..a2454c3efc65 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> @@ -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);
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] drm/amdgpu: put cancel dealyed work at first
@ 2019-11-18 11:32 ` Christian König
0 siblings, 0 replies; 6+ messages in thread
From: Christian König @ 2019-11-18 11:32 UTC (permalink / raw)
To: Yintian Tao; +Cc: amd-gfx
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:
> 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
>
> Signed-off-by: Yintian Tao <yttao@amd.com>
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 4 +---
> 1 file changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> index 17be6389adf7..a2454c3efc65 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> @@ -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);
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply [flat|nested] 6+ messages in thread[parent not found: <03d55ea8-8825-c65a-7193-9a0f11776595-5C7GfCeVMHo@public.gmane.org>]
* RE: [PATCH] drm/amdgpu: put cancel dealyed work at first
@ 2019-11-18 12:00 ` Tao, Yintian
0 siblings, 0 replies; 6+ messages in thread
From: Tao, Yintian @ 2019-11-18 12:00 UTC (permalink / raw)
To: Koenig, Christian; +Cc: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW
Hi Christian
Thanks, I got it, I will use flush_delayed_work to replace canceling.
Best Regards
Yintian Tao
-----Original Message-----
From: Koenig, Christian <Christian.Koenig@amd.com>
Sent: 2019年11月18日 19:32
To: Tao, Yintian <Yintian.Tao@amd.com>
Cc: amd-gfx@lists.freedesktop.org
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:
> 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
>
> Signed-off-by: Yintian Tao <yttao@amd.com>
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 4 +---
> 1 file changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> index 17be6389adf7..a2454c3efc65 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> @@ -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);
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply [flat|nested] 6+ messages in thread* RE: [PATCH] drm/amdgpu: put cancel dealyed work at first
@ 2019-11-18 12:00 ` Tao, Yintian
0 siblings, 0 replies; 6+ messages in thread
From: Tao, Yintian @ 2019-11-18 12:00 UTC (permalink / raw)
To: Koenig, Christian; +Cc: amd-gfx
Hi Christian
Thanks, I got it, I will use flush_delayed_work to replace canceling.
Best Regards
Yintian Tao
-----Original Message-----
From: Koenig, Christian <Christian.Koenig@amd.com>
Sent: 2019年11月18日 19:32
To: Tao, Yintian <Yintian.Tao@amd.com>
Cc: amd-gfx@lists.freedesktop.org
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:
> 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
>
> Signed-off-by: Yintian Tao <yttao@amd.com>
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 4 +---
> 1 file changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> index 17be6389adf7..a2454c3efc65 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> @@ -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);
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2019-11-18 12:00 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-11-18 8:21 [PATCH] drm/amdgpu: put cancel dealyed work at first Yintian Tao
2019-11-18 8:21 ` Yintian Tao
[not found] ` <20191118082149.16712-1-yttao-5C7GfCeVMHo@public.gmane.org>
2019-11-18 11:32 ` Christian König
2019-11-18 11:32 ` Christian König
[not found] ` <03d55ea8-8825-c65a-7193-9a0f11776595-5C7GfCeVMHo@public.gmane.org>
2019-11-18 12:00 ` Tao, Yintian
2019-11-18 12:00 ` Tao, Yintian
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.