From: Rex Zhu Date: Thu, 9 Aug 2018 07:26:06 +0000 (+0800) Subject: drm/amdgpu: Cancel gfx off delay work when driver fini/suspend X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=6c1fd99bc6694be3cca3c1778908fe40ef7532ca;p=openwrt%2Fstaging%2Fblogic.git drm/amdgpu: Cancel gfx off delay work when driver fini/suspend there may be gfx off delay work pending when suspend/driver unload, need to cancel them first. Reviewed-by: Alex Deucher Signed-off-by: Rex Zhu Signed-off-by: Alex Deucher --- diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c index 6d0ffbf5b337..99a0e478499b 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c @@ -1829,6 +1829,7 @@ static int amdgpu_device_ip_fini(struct amdgpu_device *adev) return r; } amdgpu_gfx_off_ctrl(adev, false); + cancel_delayed_work_sync(&adev->gfx.gfx_off_delay_work); r = adev->ip_blocks[i].version->funcs->hw_fini((void *)adev); /* XXX handle errors */ if (r) { @@ -2012,6 +2013,7 @@ static int amdgpu_device_ip_suspend_phase2(struct amdgpu_device *adev) /* call smu to disable gfx off feature first when suspend */ amdgpu_gfx_off_ctrl(adev, false); + cancel_delayed_work_sync(&adev->gfx.gfx_off_delay_work); for (i = adev->num_ip_blocks - 1; i >= 0; i--) { if (!adev->ip_blocks[i].status.valid)