Merge tag 'v5.3-rc7' into x86/mm, to pick up fixes

Signed-off-by: Ingo Molnar <mingo@kernel.org>

1 files changed, 12 insertions, 7 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
index 1a4412e47810..fac7aa2c244f 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
@@ -136,11 +136,6 @@ static int amdgpu_ras_reserve_vram(struct amdgpu_device *adev,
 static int amdgpu_ras_release_vram(struct amdgpu_device *adev,
                 struct amdgpu_bo **bo_ptr);
 
-static void amdgpu_ras_self_test(struct amdgpu_device *adev)
-{
-        /* TODO */
-}
-
 static ssize_t amdgpu_ras_debugfs_read(struct file *f, char __user *buf,
                                         size_t size, loff_t *pos)
 {
@@ -689,6 +684,12 @@ int amdgpu_ras_error_inject(struct amdgpu_device *adev,
         if (!obj)
                 return -EINVAL;
 
+        if (block_info.block_id != TA_RAS_BLOCK__UMC) {
+                DRM_INFO("%s error injection is not supported yet\n",
+                         ras_block_str(info->head.block));
+                return -EINVAL;
+        }
+
         ret = psp_ras_trigger_error(&adev->psp, &block_info);
         if (ret)
                 DRM_ERROR("RAS ERROR: inject %s error failed ret %d\n",
@@ -1557,6 +1558,12 @@ int amdgpu_ras_init(struct amdgpu_device *adev)
 
         amdgpu_ras_check_supported(adev, &con->hw_supported,
                         &con->supported);
+        if (!con->hw_supported) {
+                amdgpu_ras_set_context(adev, NULL);
+                kfree(con);
+                return 0;
+        }
+
         con->features = 0;
         INIT_LIST_HEAD(&con->head);
         /* Might need get this flag from vbios. */
@@ -1570,8 +1577,6 @@ int amdgpu_ras_init(struct amdgpu_device *adev)
         if (amdgpu_ras_fs_init(adev))
                 goto fs_out;
 
-        amdgpu_ras_self_test(adev);
-
         DRM_INFO("RAS INFO: ras initialized successfully, "
                         "hardware ability[%x] ras_mask[%x]\n",
                         con->hw_supported, con->supported);