diff options
author | Jammy Zhou <Jammy.Zhou@amd.com> | 2015-07-21 23:29:01 -0400 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2015-08-17 16:50:21 -0400 |
commit | 2f7d10b393c83acd3eedc3d6ab94dce29ac6a890 (patch) | |
tree | dc13e4604dc31f280f0593123e29450460969fa5 /drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | |
parent | fa9f1d4e86f67a4df03e153d9b9cd1bd1838767c (diff) |
drm/amdgpu: merge amdgpu_family.h into amd_shared.h (v2)
Make the definitions common for all driver components
v2: fix kfd
Signed-off-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.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c index ed13baa7c976..25b329f4b2d9 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | |||
@@ -82,7 +82,7 @@ static ssize_t amdgpu_set_dpm_state(struct device *dev, | |||
82 | mutex_unlock(&adev->pm.mutex); | 82 | mutex_unlock(&adev->pm.mutex); |
83 | 83 | ||
84 | /* Can't set dpm state when the card is off */ | 84 | /* Can't set dpm state when the card is off */ |
85 | if (!(adev->flags & AMDGPU_IS_PX) || | 85 | if (!(adev->flags & AMD_IS_PX) || |
86 | (ddev->switch_power_state == DRM_SWITCH_POWER_ON)) | 86 | (ddev->switch_power_state == DRM_SWITCH_POWER_ON)) |
87 | amdgpu_pm_compute_clocks(adev); | 87 | amdgpu_pm_compute_clocks(adev); |
88 | fail: | 88 | fail: |
@@ -538,7 +538,7 @@ static void amdgpu_dpm_change_power_state_locked(struct amdgpu_device *adev) | |||
538 | /* vce just modifies an existing state so force a change */ | 538 | /* vce just modifies an existing state so force a change */ |
539 | if (ps->vce_active != adev->pm.dpm.vce_active) | 539 | if (ps->vce_active != adev->pm.dpm.vce_active) |
540 | goto force; | 540 | goto force; |
541 | if (adev->flags & AMDGPU_IS_APU) { | 541 | if (adev->flags & AMD_IS_APU) { |
542 | /* for APUs if the num crtcs changed but state is the same, | 542 | /* for APUs if the num crtcs changed but state is the same, |
543 | * all we need to do is update the display configuration. | 543 | * all we need to do is update the display configuration. |
544 | */ | 544 | */ |