Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

+6 -6
+1 -1
drivers/gpu/drm/amd/amdgpu/amdgpu.h
··· 1961 1961 int amdgpu_driver_open_kms(struct drm_device *dev, struct drm_file *file_priv); 1962 1962 void amdgpu_driver_postclose_kms(struct drm_device *dev, 1963 1963 struct drm_file *file_priv); 1964 - int amdgpu_suspend(struct amdgpu_device *adev); 1964 + int amdgpu_device_ip_suspend(struct amdgpu_device *adev); 1965 1965 int amdgpu_device_suspend(struct drm_device *dev, bool suspend, bool fbcon); 1966 1966 int amdgpu_device_resume(struct drm_device *dev, bool resume, bool fbcon); 1967 1967 u32 amdgpu_get_vblank_counter_kms(struct drm_device *dev, unsigned int pipe);
+4 -4
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
··· 1690 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 1695 int i, r; 1696 1696 ··· 2344 2344 2345 2345 amdgpu_fence_driver_suspend(adev); 2346 2346 2347 - r = amdgpu_suspend(adev); 2347 + r = amdgpu_device_ip_suspend(adev); 2348 2348 2349 2349 /* evict remaining vram memory 2350 2350 * This second call to evict vram is to evict the gart page table ··· 2669 2669 } 2670 2670 2671 2671 if (need_full_reset) { 2672 - r = amdgpu_suspend(adev); 2672 + r = amdgpu_device_ip_suspend(adev); 2673 2673 2674 2674 retry: 2675 2675 r = amdgpu_asic_reset(adev); ··· 2708 2708 r = amdgpu_ib_ring_tests(adev); 2709 2709 if (r) { 2710 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 2712 need_full_reset = true; 2713 2713 goto retry; 2714 2714 }
+1 -1
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
··· 649 649 * unfortunately we can't detect certain 650 650 * hypervisors so just do this all the time. 651 651 */ 652 - amdgpu_suspend(adev); 652 + amdgpu_device_ip_suspend(adev); 653 653 } 654 654 655 655 static int amdgpu_pmops_suspend(struct device *dev)