diff options
author | Alex Deucher <alexander.deucher@amd.com> | 2017-12-14 16:47:40 -0500 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2017-12-18 10:58:54 -0500 |
commit | cdd61df614851d18b8ee72f0615202bef67f5b91 (patch) | |
tree | 8bc2e39d95a471ba06bbb33bc57d83d5b657d419 /drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | |
parent | 06ec907054c5a48f28ff6856885522e3a7103bb7 (diff) |
drm/amdgpu: rename amdgpu_suspend to amdgpu_device_ip_suspend
for consistency with the other functions in that file.
Acked-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_device.c')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c index 92b5064b3391..3beea322bc12 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | |||
@@ -1690,7 +1690,7 @@ static void amdgpu_device_ip_late_init_func_handler(struct work_struct *work) | |||
1690 | amdgpu_device_ip_late_set_cg_state(adev); | 1690 | amdgpu_device_ip_late_set_cg_state(adev); |
1691 | } | 1691 | } |
1692 | 1692 | ||
1693 | int amdgpu_suspend(struct amdgpu_device *adev) | 1693 | int amdgpu_device_ip_suspend(struct amdgpu_device *adev) |
1694 | { | 1694 | { |
1695 | int i, r; | 1695 | int i, r; |
1696 | 1696 | ||
@@ -2344,7 +2344,7 @@ int amdgpu_device_suspend(struct drm_device *dev, bool suspend, bool fbcon) | |||
2344 | 2344 | ||
2345 | amdgpu_fence_driver_suspend(adev); | 2345 | amdgpu_fence_driver_suspend(adev); |
2346 | 2346 | ||
2347 | r = amdgpu_suspend(adev); | 2347 | r = amdgpu_device_ip_suspend(adev); |
2348 | 2348 | ||
2349 | /* evict remaining vram memory | 2349 | /* evict remaining vram memory |
2350 | * This second call to evict vram is to evict the gart page table | 2350 | * This second call to evict vram is to evict the gart page table |
@@ -2669,7 +2669,7 @@ static int amdgpu_device_reset(struct amdgpu_device *adev, | |||
2669 | } | 2669 | } |
2670 | 2670 | ||
2671 | if (need_full_reset) { | 2671 | if (need_full_reset) { |
2672 | r = amdgpu_suspend(adev); | 2672 | r = amdgpu_device_ip_suspend(adev); |
2673 | 2673 | ||
2674 | retry: | 2674 | retry: |
2675 | r = amdgpu_asic_reset(adev); | 2675 | r = amdgpu_asic_reset(adev); |
@@ -2708,7 +2708,7 @@ out: | |||
2708 | r = amdgpu_ib_ring_tests(adev); | 2708 | r = amdgpu_ib_ring_tests(adev); |
2709 | if (r) { | 2709 | if (r) { |
2710 | dev_err(adev->dev, "ib ring test failed (%d).\n", r); | 2710 | dev_err(adev->dev, "ib ring test failed (%d).\n", r); |
2711 | r = amdgpu_suspend(adev); | 2711 | r = amdgpu_device_ip_suspend(adev); |
2712 | need_full_reset = true; | 2712 | need_full_reset = true; |
2713 | goto retry; | 2713 | goto retry; |
2714 | } | 2714 | } |