OSDN Git Service

drm/amdgpu: drop atom scratch save/restore in gpu reset
authorAlex Deucher <alexander.deucher@amd.com>
Thu, 6 Oct 2016 15:25:25 +0000 (11:25 -0400)
committerAlex Deucher <alexander.deucher@amd.com>
Fri, 21 Oct 2016 15:17:53 +0000 (11:17 -0400)
This is already handled by the dce IP modules in their
suspend and resume code.  No need to do it again.

Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c

index b4f4a92..2b02674 100644 (file)
@@ -2268,8 +2268,6 @@ int amdgpu_gpu_reset(struct amdgpu_device *adev)
        }
 
        if (need_full_reset) {
-               /* save scratch */
-               amdgpu_atombios_scratch_regs_save(adev);
                r = amdgpu_suspend(adev);
 
 retry:
@@ -2288,8 +2286,6 @@ retry:
                        dev_info(adev->dev, "GPU reset succeeded, trying to resume\n");
                        r = amdgpu_resume(adev);
                }
-               /* restore scratch */
-               amdgpu_atombios_scratch_regs_restore(adev);
        }
        if (!r) {
                amdgpu_irq_gpu_reset_resume_helper(adev);