drm/xe: Stop ignoring errors from xe_ttm_stolen_mgr_init()

Make sure to differentiate normal behavior, e.g. there's no stolen, from
allocation errors or failure to initialize lower layers.

Reviewed-by: Francois Dugast <francois.dugast@intel.com>
Reviewed-by: Himal Prasad Ghimiray <himal.prasad.ghimiray@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20250213192909.996148-5-lucas.demarchi@intel.com
Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>

diff --git a/drivers/gpu/drm/xe/xe_device.c b/drivers/gpu/drm/xe/xe_device.c
index 1084beef27e31d4e8051b77f881102da9f4ef147..2e934ed02713d6fe9cec8933b8db0a0efc397165 100644 (file)
--- a/drivers/gpu/drm/xe/xe_device.c
+++ b/drivers/gpu/drm/xe/xe_device.c
@@ -836,7 +836,9 @@ int xe_device_probe(struct xe_device *xe)
        }
 
        /* Allocate and map stolen after potential VRAM resize */
-       xe_ttm_stolen_mgr_init(xe);
+       err = xe_ttm_stolen_mgr_init(xe);
+       if (err)
+               return err;
 
        /*
         * Now that GT is initialized (TTM in particular),

diff --git a/drivers/gpu/drm/xe/xe_ttm_stolen_mgr.c b/drivers/gpu/drm/xe/xe_ttm_stolen_mgr.c
index d414421f8c131e67459a035972acc48e1c3174ad..d9c9d2547aadf57c1d4e7e4745891b0cc8d121d8 100644 (file)
--- a/drivers/gpu/drm/xe/xe_ttm_stolen_mgr.c
+++ b/drivers/gpu/drm/xe/xe_ttm_stolen_mgr.c
@@ -207,17 +207,16 @@ static u64 detect_stolen(struct xe_device *xe, struct xe_ttm_stolen_mgr *mgr)
 #endif
 }
 
-void xe_ttm_stolen_mgr_init(struct xe_device *xe)
+int xe_ttm_stolen_mgr_init(struct xe_device *xe)
 {
-       struct xe_ttm_stolen_mgr *mgr = drmm_kzalloc(&xe->drm, sizeof(*mgr), GFP_KERNEL);
        struct pci_dev *pdev = to_pci_dev(xe->drm.dev);
+       struct xe_ttm_stolen_mgr *mgr;
        u64 stolen_size, io_size;
        int err;
 
-       if (!mgr) {
-               drm_dbg_kms(&xe->drm, "Stolen mgr init failed\n");
-               return;
-       }
+       mgr = drmm_kzalloc(&xe->drm, sizeof(*mgr), GFP_KERNEL);
+       if (!mgr)
+               return -ENOMEM;
 
        if (IS_SRIOV_VF(xe))
                stolen_size = 0;
@@ -230,7 +229,7 @@ void xe_ttm_stolen_mgr_init(struct xe_device *xe)
 
        if (!stolen_size) {
                drm_dbg_kms(&xe->drm, "No stolen memory support\n");
-               return;
+               return 0;
        }
 
        /*
@@ -246,7 +245,7 @@ void xe_ttm_stolen_mgr_init(struct xe_device *xe)
                                     io_size, PAGE_SIZE);
        if (err) {
                drm_dbg_kms(&xe->drm, "Stolen mgr init failed: %i\n", err);
-               return;
+               return err;
        }
 
        drm_dbg_kms(&xe->drm, "Initialized stolen memory support with %llu bytes\n",
@@ -254,6 +253,8 @@ void xe_ttm_stolen_mgr_init(struct xe_device *xe)
 
        if (io_size)
                mgr->mapping = devm_ioremap_wc(&pdev->dev, mgr->io_base, io_size);
+
+       return 0;
 }
 
 u64 xe_ttm_stolen_io_offset(struct xe_bo *bo, u32 offset)

diff --git a/drivers/gpu/drm/xe/xe_ttm_stolen_mgr.h b/drivers/gpu/drm/xe/xe_ttm_stolen_mgr.h
index 1777245ff8101171cc1c244b0e10ece83fc89ddd..8e877d1e839bd534a4c24b1eb5fc74cca3d47374 100644 (file)
--- a/drivers/gpu/drm/xe/xe_ttm_stolen_mgr.h
+++ b/drivers/gpu/drm/xe/xe_ttm_stolen_mgr.h
@@ -12,7 +12,7 @@ struct ttm_resource;
 struct xe_bo;
 struct xe_device;
 
-void xe_ttm_stolen_mgr_init(struct xe_device *xe);
+int xe_ttm_stolen_mgr_init(struct xe_device *xe);
 int xe_ttm_stolen_io_mem_reserve(struct xe_device *xe, struct ttm_resource *mem);
 bool xe_ttm_stolen_cpu_access_needs_ggtt(struct xe_device *xe);
 u64 xe_ttm_stolen_io_offset(struct xe_bo *bo, u32 offset);