drm/amdgpu: support mmhub ras in amdgpu ras
authorTao Zhou <tao.zhou1@amd.com>
Tue, 6 Aug 2019 12:22:49 +0000 (20:22 +0800)
committerAlex Deucher <alexander.deucher@amd.com>
Mon, 12 Aug 2019 17:47:48 +0000 (12:47 -0500)
call mmhub ras query/inject in amdgpu ras

Signed-off-by: Tao Zhou <tao.zhou1@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

index d055ac31386ef3a6819e7cefa8f001fd78f9c666..fdcb132e832c80291a85f42f6e668a597e2949d5 100644 (file)
@@ -614,6 +614,10 @@ int amdgpu_ras_error_query(struct amdgpu_device *adev,
                if (adev->gfx.funcs->query_ras_error_count)
                        adev->gfx.funcs->query_ras_error_count(adev, &err_data);
                break;
+       case AMDGPU_RAS_BLOCK__MMHUB:
+               if (adev->mmhub_funcs->query_ras_error_count)
+                       adev->mmhub_funcs->query_ras_error_count(adev, &err_data);
+               break;
        default:
                break;
        }
@@ -659,6 +663,7 @@ int amdgpu_ras_error_inject(struct amdgpu_device *adev,
                        ret = -EINVAL;
                break;
        case AMDGPU_RAS_BLOCK__UMC:
+       case AMDGPU_RAS_BLOCK__MMHUB:
                ret = psp_ras_trigger_error(&adev->psp, &block_info);
                break;
        default: