[PATCH 7/8] drm/xe/gt: Inline all_fw_domain_init

[Maarten Lankhorst]

Have only a single init function for whole of GT to keep things
readable.

Signed-off-by: Maarten Lankhorst <dev at lankhorst.se>
---
 drivers/gpu/drm/xe/xe_gt.c | 161 +++++++++++++++++--------------------
 1 file changed, 72 insertions(+), 89 deletions(-)

diff --git a/drivers/gpu/drm/xe/xe_gt.c b/drivers/gpu/drm/xe/xe_gt.c
index dfe0def966e71..31aee3301a76c 100644
--- a/drivers/gpu/drm/xe/xe_gt.c
+++ b/drivers/gpu/drm/xe/xe_gt.c
@@ -396,93 +396,6 @@ static void dump_pat_on_error(struct xe_gt *gt)
 	xe_pat_dump(gt, &p);
 }
 
-static int all_fw_domain_init(struct xe_gt *gt)
-{
-	unsigned int fw_ref;
-	int err;
-
-	fw_ref = xe_force_wake_get(gt_to_fw(gt), XE_FORCEWAKE_ALL);
-	if (!xe_force_wake_ref_has_domain(fw_ref, XE_FORCEWAKE_ALL)) {
-		err = -ETIMEDOUT;
-		goto err_force_wake;
-	}
-
-	xe_gt_mcr_set_implicit_defaults(gt);
-	xe_wa_process_gt(gt);
-	xe_tuning_process_gt(gt);
-	xe_reg_sr_apply_mmio(&gt->reg_sr, gt);
-
-	err = xe_gt_clock_init(gt);
-	if (err)
-		goto err_force_wake;
-
-	xe_mocs_init(gt);
-	err = xe_execlist_init(gt);
-	if (err)
-		goto err_force_wake;
-
-	err = xe_hw_engines_init(gt);
-	if (err)
-		goto err_force_wake;
-
-	err = xe_uc_init_post_hwconfig(&gt->uc);
-	if (err)
-		goto err_force_wake;
-
-	if (!xe_gt_is_media_type(gt)) {
-		/*
-		 * USM has its only SA pool to non-block behind user operations
-		 */
-		if (gt_to_xe(gt)->info.has_usm) {
-			struct xe_device *xe = gt_to_xe(gt);
-
-			gt->usm.bb_pool = xe_sa_bo_manager_init(gt_to_tile(gt),
-								IS_DGFX(xe) ? SZ_1M : SZ_512K, 16);
-			if (IS_ERR(gt->usm.bb_pool)) {
-				err = PTR_ERR(gt->usm.bb_pool);
-				goto err_force_wake;
-			}
-		}
-	}
-
-	if (!xe_gt_is_media_type(gt)) {
-		struct xe_tile *tile = gt_to_tile(gt);
-
-		tile->migrate = xe_migrate_init(tile);
-		if (IS_ERR(tile->migrate)) {
-			err = PTR_ERR(tile->migrate);
-			goto err_force_wake;
-		}
-	}
-
-	err = xe_uc_init_hw(&gt->uc);
-	if (err)
-		goto err_force_wake;
-
-	/* Configure default CCS mode of 1 engine with all resources */
-	if (xe_gt_ccs_mode_enabled(gt)) {
-		gt->ccs_mode = 1;
-		xe_gt_apply_ccs_mode(gt);
-	}
-
-	if (IS_SRIOV_PF(gt_to_xe(gt)) && !xe_gt_is_media_type(gt))
-		xe_lmtt_init_hw(&gt_to_tile(gt)->sriov.pf.lmtt);
-
-	if (IS_SRIOV_PF(gt_to_xe(gt))) {
-		xe_gt_sriov_pf_init(gt);
-		xe_gt_sriov_pf_init_hw(gt);
-	}
-
-	xe_force_wake_put(gt_to_fw(gt), fw_ref);
-
-	return 0;
-
-err_force_wake:
-	xe_force_wake_put(gt_to_fw(gt), fw_ref);
-
-	return err;
-}
-
 /*
  * Initialize enough GT to be able to load GuC in order to obtain hwconfig and
  * enable CTB communication.
@@ -606,9 +519,79 @@ int xe_gt_init(struct xe_gt *gt)
 	xe_force_wake_init_engines(gt, gt_to_fw(gt));
 
 	/* With forcewake initialised on engines, call remainder with all forcewake enabled */
-	err = all_fw_domain_init(gt);
+	fw_ref = xe_force_wake_get(gt_to_fw(gt), XE_FORCEWAKE_ALL);
+	if (!xe_force_wake_ref_has_domain(fw_ref, XE_FORCEWAKE_ALL)) {
+		err = -ETIMEDOUT;
+		goto err_force_wake;
+	}
+
+	xe_gt_mcr_set_implicit_defaults(gt);
+	xe_wa_process_gt(gt);
+	xe_tuning_process_gt(gt);
+	xe_reg_sr_apply_mmio(&gt->reg_sr, gt);
+
+	err = xe_gt_clock_init(gt);
 	if (err)
-		return err;
+		goto err_force_wake;
+
+	xe_mocs_init(gt);
+	err = xe_execlist_init(gt);
+	if (err)
+		goto err_force_wake;
+
+	err = xe_hw_engines_init(gt);
+	if (err)
+		goto err_force_wake;
+
+	err = xe_uc_init_post_hwconfig(&gt->uc);
+	if (err)
+		goto err_force_wake;
+
+	if (!xe_gt_is_media_type(gt)) {
+		/*
+		 * USM has its only SA pool to non-block behind user operations
+		 */
+		if (gt_to_xe(gt)->info.has_usm) {
+			struct xe_device *xe = gt_to_xe(gt);
+
+			gt->usm.bb_pool = xe_sa_bo_manager_init(gt_to_tile(gt),
+								IS_DGFX(xe) ? SZ_1M : SZ_512K, 16);
+			if (IS_ERR(gt->usm.bb_pool)) {
+				err = PTR_ERR(gt->usm.bb_pool);
+				goto err_force_wake;
+			}
+		}
+	}
+
+	if (!xe_gt_is_media_type(gt)) {
+		struct xe_tile *tile = gt_to_tile(gt);
+
+		tile->migrate = xe_migrate_init(tile);
+		if (IS_ERR(tile->migrate)) {
+			err = PTR_ERR(tile->migrate);
+			goto err_force_wake;
+		}
+	}
+
+	err = xe_uc_init_hw(&gt->uc);
+	if (err)
+		goto err_force_wake;
+
+	/* Configure default CCS mode of 1 engine with all resources */
+	if (xe_gt_ccs_mode_enabled(gt)) {
+		gt->ccs_mode = 1;
+		xe_gt_apply_ccs_mode(gt);
+	}
+
+	if (IS_SRIOV_PF(gt_to_xe(gt)) && !xe_gt_is_media_type(gt))
+		xe_lmtt_init_hw(&gt_to_tile(gt)->sriov.pf.lmtt);
+
+	if (IS_SRIOV_PF(gt_to_xe(gt))) {
+		xe_gt_sriov_pf_init(gt);
+		xe_gt_sriov_pf_init_hw(gt);
+	}
+
+	xe_force_wake_put(gt_to_fw(gt), fw_ref);
 
 	xe_gt_record_user_engines(gt);
 
-- 
2.45.2