[RFC 3/3] drm/xe: Use new FW guard in xe_pat.c

[Michal Wajdeczko]

Start using new FW guard to minimize risk of leaking force-wake
references.

Signed-off-by: Michal Wajdeczko <michal.wajdeczko at intel.com>
---
 drivers/gpu/drm/xe/xe_pat.c | 60 +++++++++++++------------------------
 1 file changed, 20 insertions(+), 40 deletions(-)

diff --git a/drivers/gpu/drm/xe/xe_pat.c b/drivers/gpu/drm/xe/xe_pat.c
index 4ee32ee1cc88..b96395694b4b 100644
--- a/drivers/gpu/drm/xe/xe_pat.c
+++ b/drivers/gpu/drm/xe/xe_pat.c
@@ -173,12 +173,12 @@ static void program_pat_mcr(struct xe_gt *gt, const struct xe_pat_table_entry ta
 
 static void xelp_dump(struct xe_gt *gt, struct drm_printer *p)
 {
+	CLASS(xe_fw, guard)(gt_to_fw(gt), XE_FW_GT);
 	struct xe_device *xe = gt_to_xe(gt);
-	int i, err;
+	int i;
 
-	err = xe_force_wake_get(gt_to_fw(gt), XE_FW_GT);
-	if (err)
-		goto err_fw;
+	if (!guard.fw)
+		return;
 
 	drm_printf(p, "PAT table:\n");
 
@@ -189,10 +189,6 @@ static void xelp_dump(struct xe_gt *gt, struct drm_printer *p)
 		drm_printf(p, "PAT[%2d] = %s (%#8x)\n", i,
 			   XELP_MEM_TYPE_STR_MAP[mem_type], pat);
 	}
-
-	err = xe_force_wake_put(gt_to_fw(gt), XE_FW_GT);
-err_fw:
-	xe_assert(xe, !err);
 }
 
 static const struct xe_pat_ops xelp_pat_ops = {
@@ -202,12 +198,12 @@ static const struct xe_pat_ops xelp_pat_ops = {
 
 static void xehp_dump(struct xe_gt *gt, struct drm_printer *p)
 {
+	CLASS(xe_fw, guard)(gt_to_fw(gt), XE_FW_GT);
 	struct xe_device *xe = gt_to_xe(gt);
-	int i, err;
+	int i;
 
-	err = xe_force_wake_get(gt_to_fw(gt), XE_FW_GT);
-	if (err)
-		goto err_fw;
+	if (!guard.fw)
+		return;
 
 	drm_printf(p, "PAT table:\n");
 
@@ -220,10 +216,6 @@ static void xehp_dump(struct xe_gt *gt, struct drm_printer *p)
 		drm_printf(p, "PAT[%2d] = %s (%#8x)\n", i,
 			   XELP_MEM_TYPE_STR_MAP[mem_type], pat);
 	}
-
-	err = xe_force_wake_put(gt_to_fw(gt), XE_FW_GT);
-err_fw:
-	xe_assert(xe, !err);
 }
 
 static const struct xe_pat_ops xehp_pat_ops = {
@@ -233,12 +225,12 @@ static const struct xe_pat_ops xehp_pat_ops = {
 
 static void xehpc_dump(struct xe_gt *gt, struct drm_printer *p)
 {
+	CLASS(xe_fw, guard)(gt_to_fw(gt), XE_FW_GT);
 	struct xe_device *xe = gt_to_xe(gt);
-	int i, err;
+	int i;
 
-	err = xe_force_wake_get(gt_to_fw(gt), XE_FW_GT);
-	if (err)
-		goto err_fw;
+	if (!guard.fw)
+		return;
 
 	drm_printf(p, "PAT table:\n");
 
@@ -249,10 +241,6 @@ static void xehpc_dump(struct xe_gt *gt, struct drm_printer *p)
 			   REG_FIELD_GET(XELP_MEM_TYPE_MASK, pat),
 			   REG_FIELD_GET(XEHPC_CLOS_LEVEL_MASK, pat), pat);
 	}
-
-	err = xe_force_wake_put(gt_to_fw(gt), XE_FW_GT);
-err_fw:
-	xe_assert(xe, !err);
 }
 
 static const struct xe_pat_ops xehpc_pat_ops = {
@@ -262,12 +250,12 @@ static const struct xe_pat_ops xehpc_pat_ops = {
 
 static void xelpg_dump(struct xe_gt *gt, struct drm_printer *p)
 {
+	CLASS(xe_fw, guard)(gt_to_fw(gt), XE_FW_GT);
 	struct xe_device *xe = gt_to_xe(gt);
-	int i, err;
+	int i;
 
-	err = xe_force_wake_get(gt_to_fw(gt), XE_FW_GT);
-	if (err)
-		goto err_fw;
+	if (!guard.fw)
+		return;
 
 	drm_printf(p, "PAT table:\n");
 
@@ -283,10 +271,6 @@ static void xelpg_dump(struct xe_gt *gt, struct drm_printer *p)
 			   REG_FIELD_GET(XELPG_L4_POLICY_MASK, pat),
 			   REG_FIELD_GET(XELPG_INDEX_COH_MODE_MASK, pat), pat);
 	}
-
-	err = xe_force_wake_put(gt_to_fw(gt), XE_FW_GT);
-err_fw:
-	xe_assert(xe, !err);
 }
 
 /*
@@ -321,13 +305,13 @@ static void xe2lpm_program_pat(struct xe_gt *gt, const struct xe_pat_table_entry
 
 static void xe2_dump(struct xe_gt *gt, struct drm_printer *p)
 {
+	CLASS(xe_fw, guard)(gt_to_fw(gt), XE_FW_GT);
 	struct xe_device *xe = gt_to_xe(gt);
-	int i, err;
+	int i;
 	u32 pat;
 
-	err = xe_force_wake_get(gt_to_fw(gt), XE_FW_GT);
-	if (err)
-		goto err_fw;
+	if (!guard.fw)
+		return;
 
 	drm_printf(p, "PAT table:\n");
 
@@ -365,10 +349,6 @@ static void xe2_dump(struct xe_gt *gt, struct drm_printer *p)
 		   REG_FIELD_GET(XE2_L4_POLICY, pat),
 		   REG_FIELD_GET(XE2_COH_MODE, pat),
 		   pat);
-
-	err = xe_force_wake_put(gt_to_fw(gt), XE_FW_GT);
-err_fw:
-	xe_assert(xe, !err);
 }
 
 static const struct xe_pat_ops xe2_pat_ops = {
-- 
2.43.0