]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
drm/amdgpu: Remove gfx v11_0_3 ras_late_init call
authorHawking Zhang <Hawking.Zhang@amd.com>
Mon, 3 Jul 2023 08:08:22 +0000 (16:08 +0800)
committerAlex Deucher <alexander.deucher@amd.com>
Mon, 7 Aug 2023 21:12:49 +0000 (17:12 -0400)
amdgpu_ras_late_init will invoke ras_late_init call
per IP block

Signed-off-by: Hawking Zhang <Hawking.Zhang@amd.com>
Reviewed-by: Tao Zhou <tao.zhou1@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c

index 4d53d6f13c3b78ce18083a031717ca47739d2b6e..e7833010bf790ffdada47c52ee10c90f9ba3b70c 100644 (file)
@@ -4650,26 +4650,6 @@ static int gfx_v11_0_early_init(void *handle)
        return gfx_v11_0_init_microcode(adev);
 }
 
-static int gfx_v11_0_ras_late_init(void *handle)
-{
-       struct amdgpu_device *adev = (struct amdgpu_device *)handle;
-       struct ras_common_if *gfx_common_if;
-       int ret;
-
-       gfx_common_if = kzalloc(sizeof(struct ras_common_if), GFP_KERNEL);
-       if (!gfx_common_if)
-               return -ENOMEM;
-
-       gfx_common_if->block = AMDGPU_RAS_BLOCK__GFX;
-
-       ret = amdgpu_ras_feature_enable(adev, gfx_common_if, true);
-       if (ret)
-               dev_warn(adev->dev, "Failed to enable gfx11 ras feature\n");
-
-       kfree(gfx_common_if);
-       return 0;
-}
-
 static int gfx_v11_0_late_init(void *handle)
 {
        struct amdgpu_device *adev = (struct amdgpu_device *)handle;
@@ -4683,12 +4663,6 @@ static int gfx_v11_0_late_init(void *handle)
        if (r)
                return r;
 
-       if (adev->ip_versions[GC_HWIP][0] == IP_VERSION(11, 0, 3)) {
-               r = gfx_v11_0_ras_late_init(handle);
-               if (r)
-                       return r;
-       }
-
        return 0;
 }