git/linux-net
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git/ synced 2026-04-18 06:33:43 -04:00
Code Issues Packages Projects Releases Wiki Activity

drm/amdgpu: rename amdgpu_suspend to amdgpu_device_ip_suspend

Browse Source 
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>
This commit is contained in:
Alex Deucher
2017-12-14 16:47:40 -05:00
parent 06ec907054
commit cdd61df614
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
View File

@@ -1690,7 +1690,7 @@ static void amdgpu_device_ip_late_init_func_handler(struct work_struct *work)
amdgpu_device_ip_late_set_cg_state(adev);
}
int amdgpu_suspend(struct amdgpu_device *adev)
int amdgpu_device_ip_suspend(struct amdgpu_device *adev)
{
int i, r;
@@ -2344,7 +2344,7 @@ int amdgpu_device_suspend(struct drm_device *dev, bool suspend, bool fbcon)
amdgpu_fence_driver_suspend(adev);
r = amdgpu_suspend(adev);
r = amdgpu_device_ip_suspend(adev);
/* evict remaining vram memory
* 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,
}
if (need_full_reset) {
r = amdgpu_suspend(adev);
r = amdgpu_device_ip_suspend(adev);
retry:
r = amdgpu_asic_reset(adev);
@@ -2708,7 +2708,7 @@ out:
r = amdgpu_ib_ring_tests(adev);
if (r) {
dev_err(adev->dev, "ib ring test failed (%d).\n", r);
r = amdgpu_suspend(adev);
r = amdgpu_device_ip_suspend(adev);
need_full_reset = true;
goto retry;
}