From 78dd36b1099c02e437dcc08b77a5024993c2bc11 Mon Sep 17 00:00:00 2001 From: Jim Qu Date: Fri, 15 Dec 2017 15:27:57 +0800 Subject: [PATCH 2965/4131] drm/amdgpu: always cancel uvd idle handler in uvd suspend MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I62720a2df92005c8838f2e6a505f7d4840903ebb Signed-off-by: Jim Qu Reviewed-by: Christian König --- drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c index ed73661..b2b15ea 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c @@ -296,6 +296,7 @@ int amdgpu_uvd_suspend(struct amdgpu_device *adev) if (adev->uvd.vcpu_bo == NULL) return 0; + cancel_delayed_work_sync(&adev->uvd.idle_work); /* only valid for physical mode */ if (adev->asic_type < CHIP_POLARIS10) { @@ -307,8 +308,6 @@ int amdgpu_uvd_suspend(struct amdgpu_device *adev) return 0; } - cancel_delayed_work_sync(&adev->uvd.idle_work); - size = amdgpu_bo_size(adev->uvd.vcpu_bo); ptr = adev->uvd.cpu_addr; -- 2.7.4