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 27D85C27C5F for ; Mon, 10 Jun 2024 18:38:14 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 8885710E3A7; Mon, 10 Jun 2024 18:38:13 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="AJaYg09O"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.17]) by gabe.freedesktop.org (Postfix) with ESMTPS id DB7F510E379 for ; Mon, 10 Jun 2024 18:38:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1718044692; x=1749580692; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=feq0lJKTR5xPR0Z7OzvokfXO7FSJitfDipSXtfSgmFA=; b=AJaYg09Oqs5T9ZzG3mVkjFgNb7gY0T/4/dyoJoL3NEk/FVdyxemTURB+ 6rGTxNqwpf6p+GJq9BvizBS8pyqdHCnYvQLB75BssiivAwr76HU0UjbFL 7B4t29D6AwNkbK9ipHU6KfOVQCkhXXv3AaYCkcJxeHJCjgwrkgtrbBggU kK3XnQqwDeT1gaonXqTUCo4HAqVIUQMru68N4vzm5J0w1D4NVv27Zw7ti B4XAYcolAK8ElBXyInhgD7VY2bVu0QLqFZYbfXybVqiwQt/rBma+9eQft CzpyEfqjeyrysAdZuFSbezPzOeHEISEXlFVpCOOKpDXp3r+xVgnt3FxAm Q==; X-CSE-ConnectionGUID: RXxlG7gPSuGFqsTAZ96bKw== X-CSE-MsgGUID: oB6oCO7ZRo6WWKv7STTquQ== X-IronPort-AV: E=McAfee;i="6600,9927,11099"; a="14846252" X-IronPort-AV: E=Sophos;i="6.08,227,1712646000"; d="scan'208";a="14846252" Received: from fmviesa004.fm.intel.com ([10.60.135.144]) by orvoesa109.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Jun 2024 11:38:12 -0700 X-CSE-ConnectionGUID: Qf+aOMD6SrKsfZpOcTffKA== X-CSE-MsgGUID: xCKlTy9rTwihDDE0nPr1Fg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.08,227,1712646000"; d="scan'208";a="43726874" Received: from mwajdecz-mobl.ger.corp.intel.com ([10.246.1.253]) by fmviesa004-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Jun 2024 11:38:10 -0700 From: Michal Wajdeczko To: intel-xe@lists.freedesktop.org Cc: Michal Wajdeczko Subject: [PATCH 1/4] drm/xe: Prefer GT oriented messages in xe_force_wake.c Date: Mon, 10 Jun 2024 20:37:54 +0200 Message-Id: <20240610183757.1812-2-michal.wajdeczko@intel.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20240610183757.1812-1-michal.wajdeczko@intel.com> References: <20240610183757.1812-1-michal.wajdeczko@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" If possible, we should prefer xe_gt_notice() over drm_notice(). While at it, undo line split of fw_to_gt() function signature. Signed-off-by: Michal Wajdeczko --- drivers/gpu/drm/xe/xe_force_wake.c | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/drivers/gpu/drm/xe/xe_force_wake.c b/drivers/gpu/drm/xe/xe_force_wake.c index b2d385daff4b..2497f0f65aa0 100644 --- a/drivers/gpu/drm/xe/xe_force_wake.c +++ b/drivers/gpu/drm/xe/xe_force_wake.c @@ -10,22 +10,16 @@ #include "regs/xe_gt_regs.h" #include "regs/xe_reg_defs.h" #include "xe_gt.h" +#include "xe_gt_printk.h" #include "xe_mmio.h" #define XE_FORCE_WAKE_ACK_TIMEOUT_MS 50 -static struct xe_gt * -fw_to_gt(struct xe_force_wake *fw) +static struct xe_gt *fw_to_gt(struct xe_force_wake *fw) { return fw->gt; } -static struct xe_device * -fw_to_xe(struct xe_force_wake *fw) -{ - return gt_to_xe(fw_to_gt(fw)); -} - static void domain_init(struct xe_force_wake_domain *domain, enum xe_force_wake_domain_id id, struct xe_reg reg, struct xe_reg ack) @@ -135,7 +129,6 @@ static int domain_sleep_wait(struct xe_gt *gt, int xe_force_wake_get(struct xe_force_wake *fw, enum xe_force_wake_domains domains) { - struct xe_device *xe = fw_to_xe(fw); struct xe_gt *gt = fw_to_gt(fw); struct xe_force_wake_domain *domain; enum xe_force_wake_domains tmp, woken = 0; @@ -153,8 +146,8 @@ int xe_force_wake_get(struct xe_force_wake *fw, ret = domain_wake_wait(gt, domain); ret2 |= ret; if (ret) - drm_notice(&xe->drm, "Force wake domain (%d) failed to ack wake, ret=%d\n", - domain->id, ret); + xe_gt_notice(gt, "Force wake domain (%d) failed to ack wake, ret=%d\n", + domain->id, ret); } fw->awake_domains |= woken; spin_unlock_irqrestore(&fw->lock, flags); @@ -165,7 +158,6 @@ int xe_force_wake_get(struct xe_force_wake *fw, int xe_force_wake_put(struct xe_force_wake *fw, enum xe_force_wake_domains domains) { - struct xe_device *xe = fw_to_xe(fw); struct xe_gt *gt = fw_to_gt(fw); struct xe_force_wake_domain *domain; enum xe_force_wake_domains tmp, sleep = 0; @@ -183,8 +175,8 @@ int xe_force_wake_put(struct xe_force_wake *fw, ret = domain_sleep_wait(gt, domain); ret2 |= ret; if (ret) - drm_notice(&xe->drm, "Force wake domain (%d) failed to ack sleep, ret=%d\n", - domain->id, ret); + xe_gt_notice(gt, "Force wake domain (%d) failed to ack sleep, ret=%d\n", + domain->id, ret); } fw->awake_domains &= ~sleep; spin_unlock_irqrestore(&fw->lock, flags); -- 2.43.0