diff options
author | Alex Deucher <alexander.deucher@amd.com> | 2017-05-05 10:26:12 -0400 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2017-05-10 11:23:28 -0400 |
commit | bfc181af3b3978e4b9619e3b46b1c4f7e5adb43a (patch) | |
tree | 03dcddfbd3eb3e387ee5c9d50440000726961c62 | |
parent | de70c6357be23261c18fcccfd2ad148512fedd28 (diff) |
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>
-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 @@ | |||
25 | #include <linux/module.h> | 25 | #include <linux/module.h> |
26 | #include "drmP.h" | 26 | #include "drmP.h" |
27 | #include "amdgpu.h" | 27 | #include "amdgpu.h" |
28 | #include "amdgpu_atombios.h" | 28 | #include "amdgpu_atomfirmware.h" |
29 | #include "amdgpu_ih.h" | 29 | #include "amdgpu_ih.h" |
30 | #include "amdgpu_uvd.h" | 30 | #include "amdgpu_uvd.h" |
31 | #include "amdgpu_vce.h" | 31 | #include "amdgpu_vce.h" |
@@ -405,11 +405,11 @@ static void soc15_gpu_pci_config_reset(struct amdgpu_device *adev) | |||
405 | 405 | ||
406 | static int soc15_asic_reset(struct amdgpu_device *adev) | 406 | static int soc15_asic_reset(struct amdgpu_device *adev) |
407 | { | 407 | { |
408 | amdgpu_atombios_scratch_regs_engine_hung(adev, true); | 408 | amdgpu_atomfirmware_scratch_regs_engine_hung(adev, true); |
409 | 409 | ||
410 | soc15_gpu_pci_config_reset(adev); | 410 | soc15_gpu_pci_config_reset(adev); |
411 | 411 | ||
412 | amdgpu_atombios_scratch_regs_engine_hung(adev, false); | 412 | amdgpu_atomfirmware_scratch_regs_engine_hung(adev, false); |
413 | 413 | ||
414 | return 0; | 414 | return 0; |
415 | } | 415 | } |