aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c
diff options
context:
space:
mode:
authorRex Zhu <Rex.Zhu@amd.com>2015-08-25 03:57:43 -0400
committerAlex Deucher <alexander.deucher@amd.com>2015-12-21 16:42:04 -0500
commit3a2c788d95a24dc4cf720ddd19c1b115a03f41bf (patch)
tree19c30041aec015a4642ef754bc23cf4e6c47cea2 /drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c
parent0eb1c3d4084eeb6fb3a703f88d6ce1521f8fcdd1 (diff)
drm/amdgpu: share struct amdgpu_pm_state_type with powerplay module
rename amdgpu_pm_state_type to amd_pm_state_type Signed-off-by: Rex Zhu <Rex.Zhu@amd.com> Acked-by: Jammy Zhou <Jammy.Zhou@amd.com> Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c')
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c
index 22a8c7d3a3ab..eea1933947ae 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c
@@ -52,7 +52,7 @@ static ssize_t amdgpu_get_dpm_state(struct device *dev,
52{ 52{
53 struct drm_device *ddev = dev_get_drvdata(dev); 53 struct drm_device *ddev = dev_get_drvdata(dev);
54 struct amdgpu_device *adev = ddev->dev_private; 54 struct amdgpu_device *adev = ddev->dev_private;
55 enum amdgpu_pm_state_type pm = adev->pm.dpm.user_state; 55 enum amd_pm_state_type pm = adev->pm.dpm.user_state;
56 56
57 return snprintf(buf, PAGE_SIZE, "%s\n", 57 return snprintf(buf, PAGE_SIZE, "%s\n",
58 (pm == POWER_STATE_TYPE_BATTERY) ? "battery" : 58 (pm == POWER_STATE_TYPE_BATTERY) ? "battery" :
@@ -351,7 +351,7 @@ void amdgpu_dpm_thermal_work_handler(struct work_struct *work)
351 container_of(work, struct amdgpu_device, 351 container_of(work, struct amdgpu_device,
352 pm.dpm.thermal.work); 352 pm.dpm.thermal.work);
353 /* switch to the thermal state */ 353 /* switch to the thermal state */
354 enum amdgpu_pm_state_type dpm_state = POWER_STATE_TYPE_INTERNAL_THERMAL; 354 enum amd_pm_state_type dpm_state = POWER_STATE_TYPE_INTERNAL_THERMAL;
355 355
356 if (!adev->pm.dpm_enabled) 356 if (!adev->pm.dpm_enabled)
357 return; 357 return;
@@ -379,7 +379,7 @@ void amdgpu_dpm_thermal_work_handler(struct work_struct *work)
379} 379}
380 380
381static struct amdgpu_ps *amdgpu_dpm_pick_power_state(struct amdgpu_device *adev, 381static struct amdgpu_ps *amdgpu_dpm_pick_power_state(struct amdgpu_device *adev,
382 enum amdgpu_pm_state_type dpm_state) 382 enum amd_pm_state_type dpm_state)
383{ 383{
384 int i; 384 int i;
385 struct amdgpu_ps *ps; 385 struct amdgpu_ps *ps;
@@ -516,7 +516,7 @@ static void amdgpu_dpm_change_power_state_locked(struct amdgpu_device *adev)
516{ 516{
517 int i; 517 int i;
518 struct amdgpu_ps *ps; 518 struct amdgpu_ps *ps;
519 enum amdgpu_pm_state_type dpm_state; 519 enum amd_pm_state_type dpm_state;
520 int ret; 520 int ret;
521 521
522 /* if dpm init failed */ 522 /* if dpm init failed */