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 0D78CC4332F for ; Fri, 2 Dec 2022 22:16:07 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 5DF3F10E72D; Fri, 2 Dec 2022 22:16:06 +0000 (UTC) Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2A51B10E72D for ; Fri, 2 Dec 2022 22:16:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1670019363; x=1701555363; h=date:message-id:from:to:cc:subject:in-reply-to: references:mime-version; bh=HpF/HtiruftvwesFtso+1ix5zxEQ3kA75xYhCtuhmlk=; b=KCB4FsTKw1JCbYG5aQOJBsS2GVIiohZC3vpBNXQIaTBdBNwI38Xa8EGL j+IVmrLtOmUU2RDUNHhTPZNfgs89c09TAe5eqwDtJHA8CXdyWmkqSjekj TRuQBQ+P0fuoBK8oYqvua0RLi0edANLj7vljfZ3BYPfhQr28i7L1YQ6HG 8AkDB2RZnhtqmVdc4KjeXbP1nCeNaCUNAMXs1mG9myMuGrhu/kPVYBC3N NLH2+scJ6fOzK9fsHaHmAVyE6eRjwS/tlxasFETkHtzf2uOfuhZ6/fOLC rvTF4fkYUdQlx3jh4PAgLz58LPOfkFFvb/3WoaaeXXsphz99L+eY3CKCd A==; X-IronPort-AV: E=McAfee;i="6500,9779,10549"; a="296414628" X-IronPort-AV: E=Sophos;i="5.96,213,1665471600"; d="scan'208";a="296414628" Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Dec 2022 14:15:55 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10549"; a="647325773" X-IronPort-AV: E=Sophos;i="5.96,213,1665471600"; d="scan'208";a="647325773" Received: from adixit-mobl.amr.corp.intel.com (HELO adixit-arch.intel.com) ([10.212.164.213]) by fmsmga007-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Dec 2022 14:15:54 -0800 Date: Fri, 02 Dec 2022 14:15:54 -0800 Message-ID: <877cz95u5h.wl-ashutosh.dixit@intel.com> From: "Dixit, Ashutosh" To: Riana Tauro In-Reply-To: <20221130053427.2207600-4-riana.tauro@intel.com> References: <20221130053427.2207600-1-riana.tauro@intel.com> <20221130053427.2207600-4-riana.tauro@intel.com> User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI-EPG/1.14.7 (Harue) FLIM-LB/1.14.9 (=?ISO-8859-4?Q?Goj=F2?=) APEL-LB/10.8 EasyPG/1.0.0 Emacs/28.2 (x86_64-pc-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Content-Type: text/plain; charset=US-ASCII Subject: Re: [Intel-gfx] [PATCH v5 3/3] drm/i915/selftests: Add hwmon support in libpower for dgfx X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: intel-gfx@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On Tue, 29 Nov 2022 21:34:27 -0800, Riana Tauro wrote: > > diff --git a/drivers/gpu/drm/i915/selftests/libpower.c b/drivers/gpu/drm/i915/selftests/libpower.c > index c66e993c5f85..3d4d2dc74a54 100644 > --- a/drivers/gpu/drm/i915/selftests/libpower.c > +++ b/drivers/gpu/drm/i915/selftests/libpower.c > @@ -6,29 +6,28 @@ > #include > > #include "i915_drv.h" > +#include "i915_hwmon.h" > #include "libpower.h" > > -bool libpower_supported(const struct drm_i915_private *i915) > -{ > - /* Discrete cards require hwmon integration */ > - if (IS_DGFX(i915)) > - return false; > - > - return libpower_get_energy_uJ(); > -} > - > -u64 libpower_get_energy_uJ(void) > +u64 libpower_get_energy_uJ(struct intel_gt *gt) > { > unsigned long long power; > u32 units; > + long energy_uJ = 0; > > - if (rdmsrl_safe(MSR_RAPL_POWER_UNIT, &power)) > - return 0; > + if (IS_DGFX(gt->i915)) { > + if (i915_hwmon_get_energy(gt, &energy_uJ)) > + return 0; > + } else { > + if (rdmsrl_safe(MSR_RAPL_POWER_UNIT, &power)) > + return 0; > > - units = (power & 0x1f00) >> 8; > + units = (power & 0x1f00) >> 8; > > - if (rdmsrl_safe(MSR_PP1_ENERGY_STATUS, &power)) > - return 0; > + if (rdmsrl_safe(MSR_PP1_ENERGY_STATUS, &power)) > + return 0; > > - return (1000000 * power) >> units; /* convert to uJ */ > + energy_uJ = (1000000 * power) >> units; /* convert to uJ */ > + } > + return energy_uJ; > } > diff --git a/drivers/gpu/drm/i915/selftests/libpower.h b/drivers/gpu/drm/i915/selftests/libpower.h > index 5352981eb946..e4410a886654 100644 > --- a/drivers/gpu/drm/i915/selftests/libpower.h > +++ b/drivers/gpu/drm/i915/selftests/libpower.h > @@ -8,10 +8,12 @@ > > #include > > -struct drm_i915_private; > +struct intel_gt; > > -bool libpower_supported(const struct drm_i915_private *i915); > - > -u64 libpower_get_energy_uJ(void); > +u64 libpower_get_energy_uJ(struct intel_gt *gt); > > +static inline bool libpower_supported(struct intel_gt *gt) > +{ > + return libpower_get_energy_uJ(gt); > +} I think it might have been preferable to make the libpower.* changes as part of Patch 2 (so Patch 3 would be trivial) but probably doesn't matter so this is also: Reviewed-by: Ashutosh Dixit