[PATCH 1/5] drm/xe: Drop __engine_mask

[Lucas De Marchi]

On Thu, Apr 25, 2024 at 11:24:06AM GMT, Lucas De Marchi wrote:
>Not really used, it's just a copy of engine_mask, which already reads
>the fuses to mark engines as available/not-available.
>
>While at it, use XE_HW_ENGINE_BCS_MASK to span all copy engines.
>
>Signed-off-by: Lucas De Marchi <lucas.demarchi at intel.com>
>---
> drivers/gpu/drm/xe/xe_gt.c       | 3 ---
> drivers/gpu/drm/xe/xe_gt_types.h | 6 ------
> drivers/gpu/drm/xe/xe_migrate.c  | 3 +--
> drivers/gpu/drm/xe/xe_pci.c      | 6 +++---
> 4 files changed, 4 insertions(+), 14 deletions(-)
>
>diff --git a/drivers/gpu/drm/xe/xe_gt.c b/drivers/gpu/drm/xe/xe_gt.c
>index e922e77f5010..00a22cf2f5b5 100644
>--- a/drivers/gpu/drm/xe/xe_gt.c
>+++ b/drivers/gpu/drm/xe/xe_gt.c
>@@ -515,9 +515,6 @@ int xe_gt_init_hwconfig(struct xe_gt *gt)
> 	if (err)
> 		goto out_fw;
>
>-	/* XXX: Fake that we pull the engine mask from hwconfig blob */
>-	gt->info.engine_mask = gt->info.__engine_mask;
>-
> out_fw:
> 	xe_force_wake_put(gt_to_fw(gt), XE_FW_GT);
> out:
>diff --git a/drivers/gpu/drm/xe/xe_gt_types.h b/drivers/gpu/drm/xe/xe_gt_types.h
>index cfdc761ff7f4..72568414fb7d 100644
>--- a/drivers/gpu/drm/xe/xe_gt_types.h
>+++ b/drivers/gpu/drm/xe/xe_gt_types.h
>@@ -116,12 +116,6 @@ struct xe_gt {
> 		u32 reference_clock;
> 		/** @info.engine_mask: mask of engines present on GT */
> 		u64 engine_mask;
>-		/**
>-		 * @info.__engine_mask: mask of engines present on GT read from
>-		 * xe_pci.c, used to fake reading the engine_mask from the
>-		 * hwconfig blob.
>-		 */
>-		u64 __engine_mask;
> 		/** @info.gmdid: raw GMD_ID value from hardware */
> 		u32 gmdid;
> 	} info;
>diff --git a/drivers/gpu/drm/xe/xe_migrate.c b/drivers/gpu/drm/xe/xe_migrate.c
>index 9f6e9b7f11c8..59a3f24d31e6 100644
>--- a/drivers/gpu/drm/xe/xe_migrate.c
>+++ b/drivers/gpu/drm/xe/xe_migrate.c
>@@ -936,8 +936,7 @@ static bool has_service_copy_support(struct xe_gt *gt)
> 	 * all of the actual service copy engines (BCS1-BCS8) have been fused
> 	 * off.
> 	 */
>-	return gt->info.__engine_mask & GENMASK(XE_HW_ENGINE_BCS8,
>-						XE_HW_ENGINE_BCS1);
>+	return gt->info.engine_mask & XE_HW_ENGINE_BCS_MASK;

oh well, stupid me

has_service_copy_support() means bcs1 to bcs8, not bcs0.

Lucas De Marchi