drm/amdgpu: use atomfirmware interfaces for scratch reg save/restore

If the board is atomfirmware based.

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

1 files changed, 16 insertions, 4 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index df73cddf8867..dd9f493006df 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -2156,7 +2156,10 @@ int amdgpu_device_suspend(struct drm_device *dev, bool suspend, bool fbcon)
          */
         amdgpu_bo_evict_vram(adev);
 
-        amdgpu_atombios_scratch_regs_save(adev);
+        if (adev->is_atom_fw)
+                amdgpu_atomfirmware_scratch_regs_save(adev);
+        else
+                amdgpu_atombios_scratch_regs_save(adev);
         pci_save_state(dev->pdev);
         if (suspend) {
                 /* Shut down the device */
@@ -2208,7 +2211,10 @@ int amdgpu_device_resume(struct drm_device *dev, bool resume, bool fbcon)
                         return r;
                 }
         }
-        amdgpu_atombios_scratch_regs_restore(adev);
+        if (adev->is_atom_fw)
+                amdgpu_atomfirmware_scratch_regs_restore(adev);
+        else
+                amdgpu_atombios_scratch_regs_restore(adev);
 
         /* post card */
         if (amdgpu_need_post(adev)) {
@@ -2593,9 +2599,15 @@ retry:
                         amdgpu_display_stop_mc_access(adev, &save);
                         amdgpu_wait_for_idle(adev, AMD_IP_BLOCK_TYPE_GMC);
                 }
-                amdgpu_atombios_scratch_regs_save(adev);
+                if (adev->is_atom_fw)
+                        amdgpu_atomfirmware_scratch_regs_save(adev);
+                else
+                        amdgpu_atombios_scratch_regs_save(adev);
                 r = amdgpu_asic_reset(adev);
-                amdgpu_atombios_scratch_regs_restore(adev);
+                if (adev->is_atom_fw)
+                        amdgpu_atomfirmware_scratch_regs_restore(adev);
+                else
+                        amdgpu_atombios_scratch_regs_restore(adev);
                 /* post card */
                 amdgpu_atom_asic_init(adev->mode_info.atom_context);