drm/amdgpu: enable ras suspend/resume
authorxinhui pan <xinhui.pan@amd.com>
Wed, 8 May 2019 23:32:54 +0000 (07:32 +0800)
committerAlex Deucher <alexander.deucher@amd.com>
Fri, 24 May 2019 17:20:51 +0000 (12:20 -0500)
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>
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c

index da120fe..15410fa 100644 (file)
@@ -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