diff options
| author | Chunming Zhou <David1.Zhou@amd.com> | 2016-07-27 13:15:20 +0800 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2016-08-08 11:33:21 -0400 |
| commit | e72cfd58998834570b0ea9cd1961e4abe84945e1 (patch) | |
| tree | 7cae6c4bc46272207e43fdccca88da7af66ed9e8 /drivers/gpu/drm | |
| parent | 568ba157cdb561c8e52985d81bdabed3f6248f77 (diff) | |
| download | linux-stable-e72cfd58998834570b0ea9cd1961e4abe84945e1.tar.gz linux-stable-e72cfd58998834570b0ea9cd1961e4abe84945e1.tar.bz2 linux-stable-e72cfd58998834570b0ea9cd1961e4abe84945e1.zip | |
drm/amdgpu: irq resume should be immediately after gpu resume
Signed-off-by: Chunming Zhou <David1.Zhou@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c index 9b358df6e886..c715f1bd4598 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c @@ -2094,6 +2094,7 @@ retry: amdgpu_atombios_scratch_regs_restore(adev); } if (!r) { + amdgpu_irq_gpu_reset_resume_helper(adev); r = amdgpu_ib_ring_tests(adev); if (r) { dev_err(adev->dev, "ib ring test failed (%d).\n", r); @@ -2124,7 +2125,6 @@ retry: /* bad news, how to tell it to userspace ? */ dev_info(adev->dev, "GPU reset failed\n"); } - amdgpu_irq_gpu_reset_resume_helper(adev); return r; } |