Commit cdd61df6 authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/amdgpu: rename amdgpu_suspend to amdgpu_device_ip_suspend 



for consistency with the other functions in that file.

Acked-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 06ec9070

drivers/gpu/drm/amd/amdgpu/amdgpu.h

+1 −1
Original line number Diff line number Diff line
@@ -1961,7 +1961,7 @@ void amdgpu_driver_lastclose_kms(struct drm_device *dev); 
int amdgpu_driver_open_kms(struct drm_device *dev, struct drm_file *file_priv);

void amdgpu_driver_postclose_kms(struct drm_device *dev,

				 struct drm_file *file_priv);

int amdgpu_suspend(struct amdgpu_device *adev);

int amdgpu_device_ip_suspend(struct amdgpu_device *adev);

int amdgpu_device_suspend(struct drm_device *dev, bool suspend, bool fbcon);

int amdgpu_device_resume(struct drm_device *dev, bool resume, bool fbcon);

u32 amdgpu_get_vblank_counter_kms(struct drm_device *dev, unsigned int pipe);

drivers/gpu/drm/amd/amdgpu/amdgpu_device.c

+4 −4
Original line number Diff line number Diff line
@@ -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;

		}

drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c

+1 −1
Original line number Diff line number Diff line
@@ -649,7 +649,7 @@ amdgpu_pci_shutdown(struct pci_dev *pdev) 
	 * unfortunately we can't detect certain

	 * hypervisors so just do this all the time.

	 */

	amdgpu_suspend(adev);

	amdgpu_device_ip_suspend(adev);

}



static int amdgpu_pmops_suspend(struct device *dev)

CRA Git | Maintained and supported by SUSTech CRA and CCSE