From: Alex Deucher Date: Mon, 11 Nov 2019 20:48:48 +0000 (-0500) Subject: drm/amdgpu/vcn: finish delay work before release resources X-Git-Tag: v5.5-rc1~128^2~4^2 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=622b2a0ab647d2755f2c1f1000d3403e86a69763;p=linux.git drm/amdgpu/vcn: finish delay work before release resources flush/cancel delayed works before doing finalization to avoid concurrently requests. Reviewed-by: Christian König Signed-off-by: Alex Deucher --- diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c index 3199e4a5ff12..9d870444d7d6 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c @@ -193,6 +193,8 @@ int amdgpu_vcn_sw_fini(struct amdgpu_device *adev) { int i, j; + cancel_delayed_work_sync(&adev->vcn.idle_work); + if (adev->vcn.indirect_sram) { amdgpu_bo_free_kernel(&adev->vcn.dpg_sram_bo, &adev->vcn.dpg_sram_gpu_addr,