drm/amdgpu: unify some atombios/atomfirmware scratch reg functions

Now that we use a pointer to the scratch reg start offset,
most of the functions were duplicated.

Acked-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

1 files changed, 4 insertions, 16 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index 88e45c6d36ea..7963c54e5d03 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -2393,10 +2393,7 @@ int amdgpu_device_suspend(struct drm_device *dev, bool suspend, bool fbcon)
          */
         amdgpu_bo_evict_vram(adev);
 
-        if (adev->is_atom_fw)
-                amdgpu_atomfirmware_scratch_regs_save(adev);
-        else
-                amdgpu_atombios_scratch_regs_save(adev);
+        amdgpu_atombios_scratch_regs_save(adev);
         pci_save_state(dev->pdev);
         if (suspend) {
                 /* Shut down the device */
@@ -2445,10 +2442,7 @@ int amdgpu_device_resume(struct drm_device *dev, bool resume, bool fbcon)
                 if (r)
                         goto unlock;
         }
-        if (adev->is_atom_fw)
-                amdgpu_atomfirmware_scratch_regs_restore(adev);
-        else
-                amdgpu_atombios_scratch_regs_restore(adev);
+        amdgpu_atombios_scratch_regs_restore(adev);
 
         /* post card */
         if (amdgpu_need_post(adev)) {
@@ -2861,15 +2855,9 @@ int amdgpu_gpu_reset(struct amdgpu_device *adev)
                 r = amdgpu_suspend(adev);
 
 retry:
-                if (adev->is_atom_fw)
-                        amdgpu_atomfirmware_scratch_regs_save(adev);
-                else
-                        amdgpu_atombios_scratch_regs_save(adev);
+                amdgpu_atombios_scratch_regs_save(adev);
                 r = amdgpu_asic_reset(adev);
-                if (adev->is_atom_fw)
-                        amdgpu_atomfirmware_scratch_regs_restore(adev);
-                else
-                        amdgpu_atombios_scratch_regs_restore(adev);
+                amdgpu_atombios_scratch_regs_restore(adev);
                 /* post card */
                 amdgpu_atom_asic_init(adev->mode_info.atom_context);