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 EE479ECAAD5 for ; Tue, 30 Aug 2022 05:34:56 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 259C010E49F; Tue, 30 Aug 2022 05:34:56 +0000 (UTC) Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by gabe.freedesktop.org (Postfix) with ESMTPS id 346D510E49F for ; Tue, 30 Aug 2022 05:34:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1661837693; x=1693373693; h=date:message-id:from:to:cc:subject:in-reply-to: references:mime-version; bh=n0bN2e0WKifglh77Cpb5jIjBhyfy1+lrG2pX+4TM2fE=; b=I3eiECTQ1Oteoee8jFXmuj+OSowayfPvmtz9EmzYVzsTihqkfSjwPjMK c8oK6PUOCt99KPTRKFL3WUmxCpJiNKcnxM0Edg+Mh+BZzvjkTmxf9me1n /HkywfxCX/G4NooXMK0iG1JSOfrGMR/nZgKtHEcouDdNIZXW39fjRWtLB GAvNjOUnZqWx3x31g98tCzSUzgf/s8iDpvbbgFiMzZr3UpVpRuIwX5TvS bsD0/fa0gQjr7FsnNl33JWMs/6n7P8UrXa4OrlxFVThkauzdTQH0wKMuT Mrl6fzLHx+zKQ0mIdjJe6J41feZhEAdtTJQA0GcF0dU5S3sAfx4S3W5DC A==; X-IronPort-AV: E=McAfee;i="6500,9779,10454"; a="278101274" X-IronPort-AV: E=Sophos;i="5.93,274,1654585200"; d="scan'208";a="278101274" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Aug 2022 22:34:52 -0700 X-IronPort-AV: E=Sophos;i="5.93,274,1654585200"; d="scan'208";a="672690425" Received: from adixit-mobl.amr.corp.intel.com (HELO adixit-arch.intel.com) ([10.252.143.205]) by fmsmga008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Aug 2022 22:34:51 -0700 Date: Mon, 29 Aug 2022 22:34:02 -0700 Message-ID: <87h71uz451.wl-ashutosh.dixit@intel.com> From: "Dixit, Ashutosh" To: Badal Nilawar In-Reply-To: <20220825132118.784407-8-badal.nilawar@intel.com> References: <20220825132118.784407-1-badal.nilawar@intel.com> <20220825132118.784407-8-badal.nilawar@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.1 (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 7/7] drm/i915/hwmon: Extend power/energy for XEHPSDV 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: linux-hwmon@vger.kernel.org, intel-gfx@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On Thu, 25 Aug 2022 06:21:18 -0700, Badal Nilawar wrote: > > From: Dale B Stimson > > Extend hwmon power/energy for XEHPSDV especially per gt level energy > usage. A couple of very minor nits below which need to be fixed. But otherwise this patch is: Reviewed-by: Ashutosh Dixit > diff --git a/drivers/gpu/drm/i915/i915_hwmon.c b/drivers/gpu/drm/i915/i915_hwmon.c > index b8ac52f07681..76d73216c54e 100644 > --- a/drivers/gpu/drm/i915/i915_hwmon.c > +++ b/drivers/gpu/drm/i915/i915_hwmon.c > @@ -12,6 +12,7 @@ > #include "i915_reg.h" > #include "intel_mchbar_regs.h" > #include "intel_pcode.h" > +#include "gt/intel_gt.h" > #include "gt/intel_gt_regs.h" > > /* > @@ -21,7 +22,7 @@ > * - curr - milliamperes > * - energy - microjoules > */ > -#define SF_TIME 1000 > +#define SF_TIME 1000 This change should not be in this patch, it seems an unnecessary space has been inserted. > @@ -622,6 +690,10 @@ void i915_hwmon_register(struct drm_i915_private *i915) > struct i915_hwmon *hwmon; > struct device *hwmon_dev; > struct hwm_drvdata *ddat; > + struct hwm_drvdata *ddat_gt; > + struct intel_gt *gt; > + const char *ddname; Variable is not needed, let's delete it and directly use ddat_gt->name. > void i915_hwmon_unregister(struct drm_i915_private *i915) > { > struct i915_hwmon *hwmon; > struct hwm_drvdata *ddat; > + struct intel_gt *gt; > + int i; > > hwmon = fetch_and_zero(&i915->hwmon); > if (!hwmon) > return; > > ddat = &hwmon->ddat; > + > + for_each_gt(gt, i915, i) { > + struct hwm_drvdata *ddat_gt; > + > + ddat_gt = hwmon->ddat_gt + i; > + > + if (ddat_gt->hwmon_dev) { > + hwmon_device_unregister(ddat_gt->hwmon_dev); > + ddat_gt->hwmon_dev = NULL; No need to set to NULL, we are doing 'kfree(hwmon)' below, let's just delete this line. Thanks. -- Ashutosh