aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
diff options
context:
space:
mode:
authorAlex Deucher <alexander.deucher@amd.com>2016-08-23 13:25:49 -0400
committerAlex Deucher <alexander.deucher@amd.com>2016-08-25 11:19:38 -0400
commit810ddc3ab52dd84f4cd28ee8673678aece457a59 (patch)
tree8bce41a86486867dabfdbb3ee2c54296af1417a3 /drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
parent7b4d3e297e8a7d3b82e68231ff077e891c370349 (diff)
drm/amdgpu: rename suspend_kms and resume_kms
The old names were dragged over from radeon. The new ones better match the naming conventions used in the driver. No functional change. 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.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index c38dc47cd767..1ef4034b3be5 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -1027,7 +1027,7 @@ static void amdgpu_switcheroo_set_state(struct pci_dev *pdev, enum vga_switchero
1027 /* don't suspend or resume card normally */ 1027 /* don't suspend or resume card normally */
1028 dev->switch_power_state = DRM_SWITCH_POWER_CHANGING; 1028 dev->switch_power_state = DRM_SWITCH_POWER_CHANGING;
1029 1029
1030 amdgpu_resume_kms(dev, true, true); 1030 amdgpu_device_resume(dev, true, true);
1031 1031
1032 dev->pdev->d3_delay = d3_delay; 1032 dev->pdev->d3_delay = d3_delay;
1033 1033
@@ -1037,7 +1037,7 @@ static void amdgpu_switcheroo_set_state(struct pci_dev *pdev, enum vga_switchero
1037 printk(KERN_INFO "amdgpu: switched off\n"); 1037 printk(KERN_INFO "amdgpu: switched off\n");
1038 drm_kms_helper_poll_disable(dev); 1038 drm_kms_helper_poll_disable(dev);
1039 dev->switch_power_state = DRM_SWITCH_POWER_CHANGING; 1039 dev->switch_power_state = DRM_SWITCH_POWER_CHANGING;
1040 amdgpu_suspend_kms(dev, true, true); 1040 amdgpu_device_suspend(dev, true, true);
1041 dev->switch_power_state = DRM_SWITCH_POWER_OFF; 1041 dev->switch_power_state = DRM_SWITCH_POWER_OFF;
1042 } 1042 }
1043} 1043}
@@ -1774,7 +1774,7 @@ void amdgpu_device_fini(struct amdgpu_device *adev)
1774 * Suspend & resume. 1774 * Suspend & resume.
1775 */ 1775 */
1776/** 1776/**
1777 * amdgpu_suspend_kms - initiate device suspend 1777 * amdgpu_device_suspend - initiate device suspend
1778 * 1778 *
1779 * @pdev: drm dev pointer 1779 * @pdev: drm dev pointer
1780 * @state: suspend state 1780 * @state: suspend state
@@ -1783,7 +1783,7 @@ void amdgpu_device_fini(struct amdgpu_device *adev)
1783 * Returns 0 for success or an error on failure. 1783 * Returns 0 for success or an error on failure.
1784 * Called at driver suspend. 1784 * Called at driver suspend.
1785 */ 1785 */
1786int amdgpu_suspend_kms(struct drm_device *dev, bool suspend, bool fbcon) 1786int amdgpu_device_suspend(struct drm_device *dev, bool suspend, bool fbcon)
1787{ 1787{
1788 struct amdgpu_device *adev; 1788 struct amdgpu_device *adev;
1789 struct drm_crtc *crtc; 1789 struct drm_crtc *crtc;
@@ -1862,7 +1862,7 @@ int amdgpu_suspend_kms(struct drm_device *dev, bool suspend, bool fbcon)
1862} 1862}
1863 1863
1864/** 1864/**
1865 * amdgpu_resume_kms - initiate device resume 1865 * amdgpu_device_resume - initiate device resume
1866 * 1866 *
1867 * @pdev: drm dev pointer 1867 * @pdev: drm dev pointer
1868 * 1868 *
@@ -1870,7 +1870,7 @@ int amdgpu_suspend_kms(struct drm_device *dev, bool suspend, bool fbcon)
1870 * Returns 0 for success or an error on failure. 1870 * Returns 0 for success or an error on failure.
1871 * Called at driver resume. 1871 * Called at driver resume.
1872 */ 1872 */
1873int amdgpu_resume_kms(struct drm_device *dev, bool resume, bool fbcon) 1873int amdgpu_device_resume(struct drm_device *dev, bool resume, bool fbcon)
1874{ 1874{
1875 struct drm_connector *connector; 1875 struct drm_connector *connector;
1876 struct amdgpu_device *adev = dev->dev_private; 1876 struct amdgpu_device *adev = dev->dev_private;