drm/amdgpu: Introduce another ras enable function

Many parts of the whole SW stack can program the ras enablement state
during the boot. Now we handle that case by adding one function which
check the ras flags and choose different code path.

Reviewed-by: Evan Quan <evan.quan@amd.com>
Signed-off-by: xinhui pan <xinhui.pan@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
index a0e34f62f1108835c5924eb5fd4a0d4df44266ba..22bd21efe6b1edf26f2b7f68a82e864e307208ac 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
@@ -530,6 +530,33 @@ int amdgpu_ras_feature_enable(struct amdgpu_device *adev,
        return 0;
 }
 
+/* Only used in device probe stage and called only once. */
+int amdgpu_ras_feature_enable_on_boot(struct amdgpu_device *adev,
+               struct ras_common_if *head, bool enable)
+{
+       struct amdgpu_ras *con = amdgpu_ras_get_context(adev);
+       int ret;
+
+       if (!con)
+               return -EINVAL;
+
+       if (con->flags & AMDGPU_RAS_FLAG_INIT_BY_VBIOS) {
+               /* If ras is enabled by vbios, we set up ras object first in
+                * both case. For enable, that is all what we need do. For
+                * disable, we need perform a ras TA disable cmd after that.
+                */
+               ret = __amdgpu_ras_feature_enable(adev, head, 1);
+               if (ret)
+                       return ret;
+
+               if (!enable)
+                       ret = amdgpu_ras_feature_enable(adev, head, 0);
+       } else
+               ret = amdgpu_ras_feature_enable(adev, head, enable);
+
+       return ret;
+}
+
 static int amdgpu_ras_disable_all_features(struct amdgpu_device *adev,
                bool bypass)
 {

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h
index 682f2be0d68c940198227c636dd0b321c1d3d20a..eaef5edefc347e4a04b492548b72b0966236db99 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h
@@ -262,6 +262,9 @@ int amdgpu_ras_pre_fini(struct amdgpu_device *adev);
 int amdgpu_ras_feature_enable(struct amdgpu_device *adev,
                struct ras_common_if *head, bool enable);
 
+int amdgpu_ras_feature_enable_on_boot(struct amdgpu_device *adev,
+               struct ras_common_if *head, bool enable);
+
 int amdgpu_ras_sysfs_create(struct amdgpu_device *adev,
                struct ras_fs_if *head);