diff options
| author | Alex Deucher | 2017-05-05 16:26:12 +0200 |
|---|---|---|
| committer | Alex Deucher | 2017-05-10 17:23:28 +0200 |
| commit | bfc181af3b3978e4b9619e3b46b1c4f7e5adb43a (patch) | |
| tree | 03dcddfbd3eb3e387ee5c9d50440000726961c62 /drivers/gpu | |
| parent | drm/amdgpu/atomfirmware: add function to update engine hang status (diff) | |
| download | kernel-qcow2-linux-bfc181af3b3978e4b9619e3b46b1c4f7e5adb43a.tar.gz kernel-qcow2-linux-bfc181af3b3978e4b9619e3b46b1c4f7e5adb43a.tar.xz kernel-qcow2-linux-bfc181af3b3978e4b9619e3b46b1c4f7e5adb43a.zip | |
drm/amdgpu/soc15: use atomfirmware for setting bios scratch for reset
Need to use the atomfirmware interface rather than atombios since
soc15 is atomfirmware based.
Reviewed-by: Chunming Zhou <david1.zhou@amd.com>
Acked-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>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/soc15.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/soc15.c b/drivers/gpu/drm/amd/amdgpu/soc15.c index 02baa1d7bc23..6b55d451ae7f 100644 --- a/drivers/gpu/drm/amd/amdgpu/soc15.c +++ b/drivers/gpu/drm/amd/amdgpu/soc15.c @@ -25,7 +25,7 @@ #include <linux/module.h> #include "drmP.h" #include "amdgpu.h" -#include "amdgpu_atombios.h" +#include "amdgpu_atomfirmware.h" #include "amdgpu_ih.h" #include "amdgpu_uvd.h" #include "amdgpu_vce.h" @@ -405,11 +405,11 @@ static void soc15_gpu_pci_config_reset(struct amdgpu_device *adev) static int soc15_asic_reset(struct amdgpu_device *adev) { - amdgpu_atombios_scratch_regs_engine_hung(adev, true); + amdgpu_atomfirmware_scratch_regs_engine_hung(adev, true); soc15_gpu_pci_config_reset(adev); - amdgpu_atombios_scratch_regs_engine_hung(adev, false); + amdgpu_atomfirmware_scratch_regs_engine_hung(adev, false); return 0; } |