mirror of
https://github.com/torvalds/linux.git
synced 2026-03-14 00:56:20 +01:00
drm/amdgpu/vpe: cancel delayed work in hw_fini
We need to cancel any outstanding work at both suspend and driver teardown. Move the cancel to hw_fini which gets called in both cases. Reviewed-by: David (Ming Qiang) Wu <David.Wu3@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
parent
061a09b4dc
commit
ec813f384b
1 changed files with 2 additions and 4 deletions
|
|
@ -436,6 +436,8 @@ static int vpe_hw_fini(struct amdgpu_ip_block *ip_block)
|
|||
struct amdgpu_device *adev = ip_block->adev;
|
||||
struct amdgpu_vpe *vpe = &adev->vpe;
|
||||
|
||||
cancel_delayed_work_sync(&adev->vpe.idle_work);
|
||||
|
||||
vpe_ring_stop(vpe);
|
||||
|
||||
/* Power off VPE */
|
||||
|
|
@ -446,10 +448,6 @@ static int vpe_hw_fini(struct amdgpu_ip_block *ip_block)
|
|||
|
||||
static int vpe_suspend(struct amdgpu_ip_block *ip_block)
|
||||
{
|
||||
struct amdgpu_device *adev = ip_block->adev;
|
||||
|
||||
cancel_delayed_work_sync(&adev->vpe.idle_work);
|
||||
|
||||
return vpe_hw_fini(ip_block);
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue