From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 9D53CCCF9F8 for ; Fri, 7 Nov 2025 18:13:44 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 5E7D710EB91; Fri, 7 Nov 2025 18:13:44 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="M8Y7BUNy"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.18]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6DB5310EB84 for ; Fri, 7 Nov 2025 18:13:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1762539211; x=1794075211; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=icW+Z8tQnkrgaleBlrhw6he9aLXvhcNY2VSW404hkmk=; b=M8Y7BUNy04TFuKA4F23g2IzEhbXdfSHr04seLDVZLIHRynhyiNvOzmTd at9Sl+2FHCo2PJ/cbMNa1NGlslmtuP9k+n+MAvYkDXUFNnJnWx5TKwlRb /qAkhMnrpV85GWzugUcVJ4KF8qlvPasqBj0U6ALUFUGv+AbUQ3pnldkx/ 6eLAZBIX/76xsu1DPE1xWWH5GnjZ+3QBAGVepVoAM2ogdoiFFuJLvD6uz FDN8ov949i15QY9+t0g38TaqHP3Z5cGEE6n0IUE9y2thfycv50bA7MCl8 H+KSgO0FBYbPtRmTo98ZKOMC++t1J9yapmufb3/QxMg6Iv/DZZz2qoqZf Q==; X-CSE-ConnectionGUID: 7l7ml4iGT2mL/umcPVgFFg== X-CSE-MsgGUID: AXh45c20S/K6z7kFZ2yQwQ== X-IronPort-AV: E=McAfee;i="6800,10657,11606"; a="64733160" X-IronPort-AV: E=Sophos;i="6.19,287,1754982000"; d="scan'208";a="64733160" Received: from orviesa005.jf.intel.com ([10.64.159.145]) by orvoesa110.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Nov 2025 10:13:31 -0800 X-CSE-ConnectionGUID: Et5m+mihQIayt9Nn32E5hw== X-CSE-MsgGUID: gHkwNvM4TWOC3jWO8EPS7w== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.19,287,1754982000"; d="scan'208";a="193271230" Received: from mdroper-desk1.fm.intel.com ([10.1.39.133]) by orviesa005-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Nov 2025 10:13:31 -0800 From: Matt Roper To: intel-xe@lists.freedesktop.org Cc: matthew.d.roper@intel.com Subject: [PATCH 26/33] drm/xe/vram: Use scope-based forcewake Date: Fri, 7 Nov 2025 10:13:42 -0800 Message-ID: <20251107181315.631642-61-matthew.d.roper@intel.com> X-Mailer: git-send-email 2.51.1 In-Reply-To: <20251107181315.631642-35-matthew.d.roper@intel.com> References: <20251107181315.631642-35-matthew.d.roper@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: intel-xe@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel Xe graphics driver List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-xe-bounces@lists.freedesktop.org Sender: "Intel-xe" Switch VRAM code to use scope-based forcewake for consistency with other parts of the driver. Signed-off-by: Matt Roper --- drivers/gpu/drm/xe/xe_vram.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/gpu/drm/xe/xe_vram.c b/drivers/gpu/drm/xe/xe_vram.c index 8e43ebf8ee3b..11d18741313b 100644 --- a/drivers/gpu/drm/xe/xe_vram.c +++ b/drivers/gpu/drm/xe/xe_vram.c @@ -245,7 +245,6 @@ static int tile_vram_size(struct xe_tile *tile, u64 *vram_size, { struct xe_device *xe = tile_to_xe(tile); struct xe_gt *gt = tile->primary_gt; - struct xe_force_wake_ref fw_ref; u64 offset; u32 reg; @@ -265,7 +264,7 @@ static int tile_vram_size(struct xe_tile *tile, u64 *vram_size, return 0; } - fw_ref = xe_force_wake_get(gt_to_fw(gt), XE_FW_GT); + CLASS(xe_force_wake, fw_ref)(gt_to_fw(gt), XE_FW_GT); if (!fw_ref.domains) return -ETIMEDOUT; @@ -289,8 +288,6 @@ static int tile_vram_size(struct xe_tile *tile, u64 *vram_size, /* remove the tile offset so we have just the available size */ *vram_size = offset - *tile_offset; - xe_force_wake_put(fw_ref); - return 0; } -- 2.51.1