drm/xe/drm_ras: Move has_drm_ras check to drm_ras layer

has_drm_ras flag is meant to facilitate drm_ras feature. Move it to the
correct layer where it belongs.

Fixes: 63dfab5786ca ("drm/xe/xe_ras: Add drm_ras feature flag")
Signed-off-by: Raag Jadav <raag.jadav@intel.com>
Reviewed-by: Riana Tauro <riana.tauro@intel.com>
Link: https://patch.msgid.link/20260810124101.105832-1-raag.jadav@intel.com
Signed-off-by: Matt Roper <matthew.d.roper@intel.com>
(cherry picked from commit 9f15135fe2dd9cff3caccab2f6ff4df86804b3c2)
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>

diff --git a/drivers/gpu/drm/xe/xe_drm_ras.c b/drivers/gpu/drm/xe/xe_drm_ras.c
index 7937d8b..984fa67 100644 (file)
--- a/drivers/gpu/drm/xe/xe_drm_ras.c
+++ b/drivers/gpu/drm/xe/xe_drm_ras.c
@@ -199,6 +199,9 @@ int xe_drm_ras_init(struct xe_device *xe)
        struct drm_ras_node *node;
        int err;
 
+       if (!xe->info.has_drm_ras)
+               return 0;
+
        node = drmm_kcalloc(&xe->drm, DRM_XE_RAS_ERR_SEV_MAX, sizeof(*node), GFP_KERNEL);
        if (!node)
                return -ENOMEM;

diff --git a/drivers/gpu/drm/xe/xe_ras.c b/drivers/gpu/drm/xe/xe_ras.c
index c8d4028..d98ff94 100644 (file)
--- a/drivers/gpu/drm/xe/xe_ras.c
+++ b/drivers/gpu/drm/xe/xe_ras.c
@@ -681,9 +681,6 @@ void xe_ras_init(struct xe_device *xe)
 {
        int ret;
 
-       if (!xe->info.has_drm_ras)
-               return;
-
        xe_drm_ras_init(xe);
 
        if (!xe->info.has_sysctrl)