[PATCH 8/8] drm/xe: Split init of xe_gt_init_hwconfig to xe_gt_init and *_early

[Lucas De Marchi]

On Mon, Mar 10, 2025 at 09:06:53PM +0100, Maarten Lankhorst wrote:
>Now that we added the separate step of initialising GUC in
>xe_gt_init_early, it should be ok to initialise the minimum during early
>init, and the rest after allocations are allowed.
>
>Signed-off-by: Maarten Lankhorst <dev at lankhorst.se>
>---
> drivers/gpu/drm/xe/xe_device.c |  6 ----
> drivers/gpu/drm/xe/xe_gt.c     | 60 +++++++++++++++-------------------
> drivers/gpu/drm/xe/xe_gt.h     |  1 -
> 3 files changed, 26 insertions(+), 41 deletions(-)
>
>diff --git a/drivers/gpu/drm/xe/xe_device.c b/drivers/gpu/drm/xe/xe_device.c
>index 343f7ac67eaee..0eb6eae65a52e 100644
>--- a/drivers/gpu/drm/xe/xe_device.c
>+++ b/drivers/gpu/drm/xe/xe_device.c
>@@ -780,12 +780,6 @@ int xe_device_probe(struct xe_device *xe)
> 			return err;
> 	}
>
>-	for_each_gt(gt, xe, id) {
>-		err = xe_gt_init_hwconfig(gt);
>-		if (err)
>-			return err;
>-	}
>-
> 	err = xe_devcoredump_init(xe);
> 	if (err)
> 		return err;
>diff --git a/drivers/gpu/drm/xe/xe_gt.c b/drivers/gpu/drm/xe/xe_gt.c
>index 31aee3301a76c..8a8882c909bea 100644
>--- a/drivers/gpu/drm/xe/xe_gt.c
>+++ b/drivers/gpu/drm/xe/xe_gt.c
>@@ -348,6 +348,7 @@ int xe_gt_record_default_lrcs(struct xe_gt *gt)
>
> int xe_gt_init_early(struct xe_gt *gt)
> {
>+	unsigned int fw_ref;
> 	int err;
>
> 	if (IS_SRIOV_PF(gt_to_xe(gt))) {
>@@ -382,28 +383,9 @@ int xe_gt_init_early(struct xe_gt *gt)
> 	 */
> 	xe_gt_mmio_init(gt);
>
>-	return xe_uc_init_noalloc(&gt->uc);
>-}
>-
>-static void dump_pat_on_error(struct xe_gt *gt)
>-{
>-	struct drm_printer p;
>-	char prefix[32];
>-
>-	snprintf(prefix, sizeof(prefix), "[GT%u Error]", gt->info.id);
>-	p = drm_dbg_printer(&gt_to_xe(gt)->drm, DRM_UT_DRIVER, prefix);
>-
>-	xe_pat_dump(gt, &p);
>-}
>-
>-/*
>- * Initialize enough GT to be able to load GuC in order to obtain hwconfig and
>- * enable CTB communication.
>- */
>-int xe_gt_init_hwconfig(struct xe_gt *gt)
>-{
>-	unsigned int fw_ref;
>-	int err;
>+	err = xe_uc_init_noalloc(&gt->uc);
>+	if (err)
>+		return err;
>
> 	fw_ref = xe_force_wake_get(gt_to_fw(gt), XE_FW_GT);
> 	if (!fw_ref)
>@@ -411,22 +393,20 @@ int xe_gt_init_hwconfig(struct xe_gt *gt)
>
> 	xe_gt_mcr_init_early(gt);
> 	xe_pat_init(gt);
>+	xe_force_wake_put(gt_to_fw(gt), fw_ref);
>
>-	err = xe_uc_init(&gt->uc);
>-	if (err)
>-		goto out_fw;
>+	return 0;
>+}
>
>-	err = xe_uc_init_hwconfig(&gt->uc);
>-	if (err)
>-		goto out_fw;
>+static void dump_pat_on_error(struct xe_gt *gt)
>+{
>+	struct drm_printer p;
>+	char prefix[32];
>
>-	xe_gt_topology_init(gt);
>-	xe_gt_mcr_init(gt);
>-	xe_gt_enable_host_l2_vram(gt);
>+	snprintf(prefix, sizeof(prefix), "[GT%u Error]", gt->info.id);
>+	p = drm_dbg_printer(&gt_to_xe(gt)->drm, DRM_UT_DRIVER, prefix);
>
>-out_fw:
>-	xe_force_wake_put(gt_to_fw(gt), fw_ref);
>-	return err;
>+	xe_pat_dump(gt, &p);
> }
>
> static void xe_gt_fini(void *arg)
>@@ -471,6 +451,18 @@ int xe_gt_init(struct xe_gt *gt)
> 	if (!fw_ref)
> 		return -ETIMEDOUT;
>
>+	err = xe_uc_init(&gt->uc);
>+	if (err)
>+		goto err_force_wake;
>+
>+	err = xe_uc_init_hwconfig(&gt->uc);
>+	if (err)
>+		goto err_force_wake;

with the merge of these done later on top,

Reviewed-by: Lucas De Marchi <lucas.demarchi at intel.com>

Lucas De Marchi