Merge tag 'drm-msm-next-2021-06-23b' of https://gitlab.freedesktop.org/drm/msm into...

[linux.git] / drivers / gpu / drm / amd / amdgpu / amdgpu_ras.c

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
index ec936cde272602f9a1840012f0799690514b0059..bd24639aedfcbd8e9291899ffe6f437ee185acc0 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
@@ -2122,7 +2122,7 @@ static void amdgpu_ras_counte_dw(struct work_struct *work)
        struct amdgpu_ras *con = container_of(work, struct amdgpu_ras,
                                              ras_counte_delay_work.work);
        struct amdgpu_device *adev = con->adev;
-       struct drm_device *dev = &adev->ddev;
+       struct drm_device *dev = adev_to_drm(adev);
        unsigned long ce_count, ue_count;
        int res;
 
@@ -2407,6 +2407,7 @@ int amdgpu_ras_pre_fini(struct amdgpu_device *adev)
        if (!adev->ras_enabled || !con)
                return 0;
 
+
        /* Need disable ras on all IPs here before ip [hw/sw]fini */
        amdgpu_ras_disable_all_features(adev, 0);
        amdgpu_ras_recovery_fini(adev);