diff options
| author | Rex Zhu <Rex.Zhu@amd.com> | 2018-07-27 02:55:09 -0400 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2018-08-27 12:09:52 -0400 |
| commit | 408acede8732bec629959f8628c46ab4517e3995 (patch) | |
| tree | a3482b1c10208e1c4c1b2dd843cdf34bed7dba43 /drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | |
| parent | 1e317b99f0c244bd8830918fdae9715210baf4fe (diff) | |
drm/amdgpu: Ctrl gfx off via amdgpu_gfx_off_ctrl
use amdgpu_gfx_off_ctrl function so driver can arbitrate
whether the gfx ip can be power off or power on.
Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: Rex Zhu <Rex.Zhu@amd.com>
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.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c index 82bc329919fe..6d0ffbf5b337 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | |||
| @@ -1828,8 +1828,7 @@ static int amdgpu_device_ip_fini(struct amdgpu_device *adev) | |||
| 1828 | adev->ip_blocks[i].version->funcs->name, r); | 1828 | adev->ip_blocks[i].version->funcs->name, r); |
| 1829 | return r; | 1829 | return r; |
| 1830 | } | 1830 | } |
| 1831 | if (adev->powerplay.pp_funcs->set_powergating_by_smu) | 1831 | amdgpu_gfx_off_ctrl(adev, false); |
| 1832 | amdgpu_dpm_set_powergating_by_smu(adev, AMD_IP_BLOCK_TYPE_GFX, false); | ||
| 1833 | r = adev->ip_blocks[i].version->funcs->hw_fini((void *)adev); | 1832 | r = adev->ip_blocks[i].version->funcs->hw_fini((void *)adev); |
| 1834 | /* XXX handle errors */ | 1833 | /* XXX handle errors */ |
| 1835 | if (r) { | 1834 | if (r) { |
| @@ -2012,8 +2011,7 @@ static int amdgpu_device_ip_suspend_phase2(struct amdgpu_device *adev) | |||
| 2012 | } | 2011 | } |
| 2013 | 2012 | ||
| 2014 | /* call smu to disable gfx off feature first when suspend */ | 2013 | /* call smu to disable gfx off feature first when suspend */ |
| 2015 | if (adev->powerplay.pp_funcs->set_powergating_by_smu) | 2014 | amdgpu_gfx_off_ctrl(adev, false); |
| 2016 | amdgpu_dpm_set_powergating_by_smu(adev, AMD_IP_BLOCK_TYPE_GFX, false); | ||
| 2017 | 2015 | ||
| 2018 | for (i = adev->num_ip_blocks - 1; i >= 0; i--) { | 2016 | for (i = adev->num_ip_blocks - 1; i >= 0; i--) { |
| 2019 | if (!adev->ip_blocks[i].status.valid) | 2017 | if (!adev->ip_blocks[i].status.valid) |