]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
drm/amdgpu: drop scratch regs save and restore from GPU reset handling
authorAlex Deucher <alexander.deucher@amd.com>
Tue, 12 Dec 2017 20:22:56 +0000 (15:22 -0500)
committerAlex Deucher <alexander.deucher@amd.com>
Wed, 13 Dec 2017 22:28:09 +0000 (17:28 -0500)
The expectation is that the base driver doesn't mess with these.
Some components interact with these directly so let the components
handle these directly.

Reviewed-by: Harry Wentland <harry.wentland@amd.com>
Acked-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 ca1cf8a71dda1c0af6c636ed4fa5cd1dcdd6b49a..046b9d5bc14d2d603cbcc090e88f3dbcd45919ad 100644 (file)
@@ -2896,9 +2896,7 @@ static int amdgpu_reset(struct amdgpu_device *adev, uint64_t* reset_flags)
                r = amdgpu_suspend(adev);
 
 retry:
-               amdgpu_atombios_scratch_regs_save(adev);
                r = amdgpu_asic_reset(adev);
-               amdgpu_atombios_scratch_regs_restore(adev);
                /* post card */
                amdgpu_atom_asic_init(adev->mode_info.atom_context);