Re: [PATCH] drm/amd/amdgpu: finish delay works before release resources

[Christian König <ckoenig.leichtzumerken@xxxxxxxxx>]

Am 08.11.19 um 11:23 schrieb Jesse Zhang:
> flush/cancel delayed works before doing finalization
> to avoid concurrently requests.
>
> Change-Id: I85b7ffbb34875af1c734cb4573a6ecc71d39d652
> Signed-off-by: Jesse Zhang <zhexi.zhang@xxxxxxx>

Reviewed-by: Christian König <christian.koenig@xxxxxxx>

> ---
>   drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 3 +++
>   drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c    | 1 +
>   drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c    | 1 +
>   3 files changed, 5 insertions(+)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> index 03287d9..5e5578a 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> @@ -3146,6 +3146,9 @@ void amdgpu_device_fini(struct amdgpu_device *adev)
>   
>   	DRM_INFO("amdgpu: finishing device.\n");
>   	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){
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c
> index d1b10b5..32128e9 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c
> @@ -299,6 +299,7 @@ int amdgpu_uvd_sw_fini(struct amdgpu_device *adev)
>   {
>   	int i, j;
>   
> +	cancel_delayed_work_sync(&adev->uvd.idle_work);
>   	drm_sched_entity_destroy(&adev->uvd.entity);
>   
>   	for (j = 0; j < adev->uvd.num_uvd_inst; ++j) {
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
> index 92aa3b1..f70b55f 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
> @@ -216,6 +216,7 @@ int amdgpu_vce_sw_fini(struct amdgpu_device *adev)
>   	if (adev->vce.vcpu_bo == NULL)
>   		return 0;
>   
> +	cancel_delayed_work_sync(&adev->vce.idle_work);
>   	drm_sched_entity_destroy(&adev->vce.entity);
>   
>   	amdgpu_bo_free_kernel(&adev->vce.vcpu_bo, &adev->vce.gpu_addr,

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