Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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>
+16
-4
+16
-4
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+16
-4
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
···
2156
2156
*/
2157
2157
amdgpu_bo_evict_vram(adev);
2158
2158
2159
-
amdgpu_atombios_scratch_regs_save(adev);
2159
+
if (adev->is_atom_fw)
2160
+
amdgpu_atomfirmware_scratch_regs_save(adev);
2161
+
else
2162
+
amdgpu_atombios_scratch_regs_save(adev);
2160
2163
pci_save_state(dev->pdev);
2161
2164
if (suspend) {
2162
2165
/* Shut down the device */
···
2211
2208
return r;
2212
2209
}
2213
2210
}
2214
-
amdgpu_atombios_scratch_regs_restore(adev);
2211
+
if (adev->is_atom_fw)
2212
+
amdgpu_atomfirmware_scratch_regs_restore(adev);
2213
+
else
2214
+
amdgpu_atombios_scratch_regs_restore(adev);
2215
2215
2216
2216
/* post card */
2217
2217
if (amdgpu_need_post(adev)) {
···
2599
2593
amdgpu_display_stop_mc_access(adev, &save);
2600
2594
amdgpu_wait_for_idle(adev, AMD_IP_BLOCK_TYPE_GMC);
2601
2595
}
2602
-
amdgpu_atombios_scratch_regs_save(adev);
2596
+
if (adev->is_atom_fw)
2597
+
amdgpu_atomfirmware_scratch_regs_save(adev);
2598
+
else
2599
+
amdgpu_atombios_scratch_regs_save(adev);
2603
2600
r = amdgpu_asic_reset(adev);
2604
-
amdgpu_atombios_scratch_regs_restore(adev);
2601
+
if (adev->is_atom_fw)
2602
+
amdgpu_atomfirmware_scratch_regs_restore(adev);
2603
+
else
2604
+
amdgpu_atombios_scratch_regs_restore(adev);
2605
2605
/* post card */
2606
2606
amdgpu_atom_asic_init(adev->mode_info.atom_context);
2607
2607