diff options
| author | xinhui pan <xinhui.pan@amd.com> | 2019-05-09 07:32:54 +0800 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2019-05-24 12:20:51 -0500 |
| commit | 5e6932fe31624f97e394c4106b4c209db03810d9 (patch) | |
| tree | 77eb4cbe80b3eef543ea4284154c623a83f18e18 /drivers/gpu/drm | |
| parent | 511fdbc33aaa4758f7c445183ff840e251c0b427 (diff) | |
| download | linux-stable-5e6932fe31624f97e394c4106b4c209db03810d9.tar.gz linux-stable-5e6932fe31624f97e394c4106b4c209db03810d9.tar.bz2 linux-stable-5e6932fe31624f97e394c4106b4c209db03810d9.zip | |
drm/amdgpu: enable ras suspend/resume
suspend/resume will change ras state behind us. Let driver get notified.
Signed-off-by: xinhui pan <xinhui.pan@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: James Zhu <James.Zhu@amd.com>
Tested-by: James Zhu <James.Zhu@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c index da120fe330be..15410fa4a85c 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c @@ -2897,6 +2897,8 @@ int amdgpu_device_suspend(struct drm_device *dev, bool suspend, bool fbcon) amdgpu_amdkfd_suspend(adev); + amdgpu_ras_suspend(adev); + r = amdgpu_device_ip_suspend_phase1(adev); /* evict vram memory */ @@ -3017,6 +3019,8 @@ int amdgpu_device_resume(struct drm_device *dev, bool resume, bool fbcon) drm_kms_helper_poll_enable(dev); + amdgpu_ras_resume(adev); + /* * Most of the connector probing functions try to acquire runtime pm * refs to ensure that the GPU is powered on when connector polling is |