drm/amdgpu: replace AMDGPU_RAS_UE with AMDGPU_RAS_SUCCESS
authorTao Zhou <tao.zhou1@amd.com>
Thu, 1 Aug 2019 09:30:35 +0000 (17:30 +0800)
committerAlex Deucher <alexander.deucher@amd.com>
Fri, 2 Aug 2019 15:30:39 +0000 (10:30 -0500)
ce can also trigger interrupt, and even both ce and ue error can be
found in one ras query, distinguishing between ce and ue in interrupt
handler is uncessary.

Signed-off-by: Tao Zhou <tao.zhou1@amd.com>
Suggested-by: Guchun Chen <guchun.chen@amd.com>
Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c

index d4c0847..709d229 100644 (file)
@@ -1048,7 +1048,7 @@ static void amdgpu_ras_interrupt_handler(struct ras_manager *obj)
                         * But leave IP do that recovery, here we just dispatch
                         * the error.
                         */
-                       if (ret == AMDGPU_RAS_UE) {
+                       if (ret == AMDGPU_RAS_SUCCESS) {
                                /* these counts could be left as 0 if
                                 * some blocks do not count error number
                                 */
index c7910be..206ef9f 100644 (file)
@@ -5654,7 +5654,7 @@ static int gfx_v9_0_process_ras_data_cb(struct amdgpu_device *adev,
        if (adev->gfx.funcs->query_ras_error_count)
                adev->gfx.funcs->query_ras_error_count(adev, err_data);
        amdgpu_ras_reset_gpu(adev, 0);
-       return AMDGPU_RAS_UE;
+       return AMDGPU_RAS_SUCCESS;
 }
 
 static const struct {
index a357552..0c77b9f 100644 (file)
@@ -259,7 +259,7 @@ static int gmc_v9_0_process_ras_data_cb(struct amdgpu_device *adev,
        if (err_data->ue_count)
                amdgpu_ras_reset_gpu(adev, 0);
 
-       return AMDGPU_RAS_UE;
+       return AMDGPU_RAS_SUCCESS;
 }
 
 static int gmc_v9_0_process_ecc_irq(struct amdgpu_device *adev,
index 30153c3..5a73966 100644 (file)
@@ -1985,7 +1985,7 @@ static int sdma_v4_0_process_ras_data_cb(struct amdgpu_device *adev,
 
        amdgpu_ras_reset_gpu(adev, 0);
 
-       return AMDGPU_RAS_UE;
+       return AMDGPU_RAS_SUCCESS;
 }
 
 static int sdma_v4_0_process_ecc_irq(struct amdgpu_device *adev,