From nobody Sun Dec 14 21:45:09 2025 Received: from mblankhorst.nl (lankhorst.se [141.105.120.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 91A31215177 for ; Tue, 4 Feb 2025 13:21:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=141.105.120.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738675315; cv=none; b=EzUnOUd7h9JWv0RvllgZJTvPQLl9UP4FXDfacWd3+5kGdl1NQqIc9GDxruWp3IyCAsIxQwCEihcrTAiT1qSYZBKuvUBREfJDxY7UqXRy83dWggokLZajTuT9jCexxvMF2TgM+tPl6ukZScjIDrDGXwsNeE6MSQI5ffkI5dxg73o= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738675315; c=relaxed/simple; bh=j+XCIO7cJ0poGayUASQ3i/DaaSTSNBh1QDclmA1BNDc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=q36ifDdocq1/NgFm2Tv4EeWjzUdVogghOfH1W0j8k1yzbN0h74jt8GOCuoIu5WRhEhuQ8XGpQ+QW7vlyEt55ZLhkihyVgSBCaGj8hsj9Dx9R1e7mESOVF3dS2EWj6579LMRvNTfyjHxhu2wHM1M6vhu3u/ZT96JLYV83PI+Ndqw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=lankhorst.se; spf=none smtp.mailfrom=mblankhorst.nl; arc=none smtp.client-ip=141.105.120.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=lankhorst.se Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=mblankhorst.nl From: Maarten Lankhorst To: intel-xe@lists.freedesktop.org Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Maarten Lankhorst , Ingo Molnar , David Lechner , Peter Zijlstra , Will Deacon , Waiman Long , Boqun Feng Subject: [PATCH-resent-to-correct-ml 6/8] drm/xe/gsc: Use guard helper for xe_gsc_print_info. Date: Tue, 4 Feb 2025 14:22:35 +0100 Message-ID: <20250204132238.162608-7-dev@lankhorst.se> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250204132238.162608-1-dev@lankhorst.se> References: <20250204132238.162608-1-dev@lankhorst.se> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" As an example on how it works. Signed-off-by: Maarten Lankhorst --- drivers/gpu/drm/xe/xe_gsc.c | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/drivers/gpu/drm/xe/xe_gsc.c b/drivers/gpu/drm/xe/xe_gsc.c index 1eb791ddc375c..aee9f58b1c3c6 100644 --- a/drivers/gpu/drm/xe/xe_gsc.c +++ b/drivers/gpu/drm/xe/xe_gsc.c @@ -600,7 +600,6 @@ void xe_gsc_print_info(struct xe_gsc *gsc, struct drm_p= rinter *p) { struct xe_gt *gt =3D gsc_to_gt(gsc); struct xe_mmio *mmio =3D >->mmio; - unsigned int fw_ref; =20 xe_uc_fw_print(&gsc->fw, p); =20 @@ -609,17 +608,12 @@ void xe_gsc_print_info(struct xe_gsc *gsc, struct drm= _printer *p) if (!xe_uc_fw_is_enabled(&gsc->fw)) return; =20 - fw_ref =3D xe_force_wake_get(gt_to_fw(gt), XE_FW_GSC); - if (!fw_ref) - return; - - drm_printf(p, "\nHECI1 FWSTS: 0x%08x 0x%08x 0x%08x 0x%08x 0x%08x 0x%08x\n= ", - xe_mmio_read32(mmio, HECI_FWSTS1(MTL_GSC_HECI1_BASE)), - xe_mmio_read32(mmio, HECI_FWSTS2(MTL_GSC_HECI1_BASE)), - xe_mmio_read32(mmio, HECI_FWSTS3(MTL_GSC_HECI1_BASE)), - xe_mmio_read32(mmio, HECI_FWSTS4(MTL_GSC_HECI1_BASE)), - xe_mmio_read32(mmio, HECI_FWSTS5(MTL_GSC_HECI1_BASE)), - xe_mmio_read32(mmio, HECI_FWSTS6(MTL_GSC_HECI1_BASE))); - - xe_force_wake_put(gt_to_fw(gt), fw_ref); + scoped_guard(xe_force_wake_get, gt_to_fw(gt), XE_FW_GSC) + drm_printf(p, "\nHECI1 FWSTS: 0x%08x 0x%08x 0x%08x 0x%08x 0x%08x 0x%08x\= n", + xe_mmio_read32(mmio, HECI_FWSTS1(MTL_GSC_HECI1_BASE)), + xe_mmio_read32(mmio, HECI_FWSTS2(MTL_GSC_HECI1_BASE)), + xe_mmio_read32(mmio, HECI_FWSTS3(MTL_GSC_HECI1_BASE)), + xe_mmio_read32(mmio, HECI_FWSTS4(MTL_GSC_HECI1_BASE)), + xe_mmio_read32(mmio, HECI_FWSTS5(MTL_GSC_HECI1_BASE)), + xe_mmio_read32(mmio, HECI_FWSTS6(MTL_GSC_HECI1_BASE))); } --=20 2.47.1