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 AA7F4D69105 for ; Thu, 28 Nov 2024 12:30:49 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 3207E10E379; Thu, 28 Nov 2024 12:30:49 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="JVkLVJjN"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.10]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0807D10E379; Thu, 28 Nov 2024 12:30:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1732797048; x=1764333048; h=date:from:to:cc:subject:message-id:reply-to:references: mime-version:in-reply-to; bh=8+yTnlcawcPsH0Ll+5j9DHNc7iW4jRqFOX+ZDxHaqoI=; b=JVkLVJjN6rhJ152VX1bL3dsMHuXQWzLwYW0UA3qmSRDgL+YN7Ci5rqfk MoxMSWDJak1qOJibOFmWlV/eGyDEMsZ8QHADYo8LPG9BcE0PrfWtA05J3 6xDiAf+Ndo7vaISwEokoRnS0jBx++5ZXEFVGUaVi10ZqKI3q1CJbOAfbZ vhFsFpug2ioTel0szlSEz8n6kRegxSCx77+nEXduuX2tDczO+Y42Zs3zK xTOefhDclEeuFSVqrm2OevaxkpL7YAc2ytg471DGnQY88/oh1YqkEnNaj VxF3kZDJ5EUcLNzLUdlDhEgEy/gU9iaLwKUiFLCV9QkNUx9ewdxWH3d/0 A==; X-CSE-ConnectionGUID: NzP964n3Tu+H5oriSJPyng== X-CSE-MsgGUID: Wz3U8QYcQ+ePALKkMAF6wg== X-IronPort-AV: E=McAfee;i="6700,10204,11269"; a="44414025" X-IronPort-AV: E=Sophos;i="6.12,192,1728975600"; d="scan'208";a="44414025" Received: from orviesa010.jf.intel.com ([10.64.159.150]) by fmvoesa104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Nov 2024 04:30:47 -0800 X-CSE-ConnectionGUID: VtwuSqiRSESHrL97ZodIlw== X-CSE-MsgGUID: oko75NNGS9++3TM0Ki340w== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.12,192,1728975600"; d="scan'208";a="92097504" Received: from ideak-desk.fi.intel.com ([10.237.72.78]) by orviesa010-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Nov 2024 04:30:46 -0800 Date: Thu, 28 Nov 2024 14:31:22 +0200 From: Imre Deak To: Jani Nikula Cc: intel-gfx@lists.freedesktop.org, intel-xe@lists.freedesktop.org Subject: Re: [PATCH 1/7] drm/i915/display: simplify conditional compilation on runtime PM debug Message-ID: References: <566defd545f4ea021b0baa1e62d506befbf68a91.1732727056.git.jani.nikula@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <566defd545f4ea021b0baa1e62d506befbf68a91.1732727056.git.jani.nikula@intel.com> 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: , Reply-To: imre.deak@intel.com Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On Wed, Nov 27, 2024 at 07:06:02PM +0200, Jani Nikula wrote: > Simplify conditional compilation on CONFIG_DRM_I915_DEBUG_RUNTIME_PM. > Hide it all inside intel_display_power.c. > > This will unnecessarily pass in the wakeref also when debug is disabled, > but it should not matter a whole lot. Ftr: there are a lot of callers of these functions and so this change removing the optimization increases the code by >1kB in the non-debug build: $ size ~/i915-opt.ko ~/i915-noopt.ko text data bss dec hex filename 3346869 325789 7680 3680338 382852 /home/imre/i915-opt.ko 3345708 325773 7680 3679161 3823b9 /home/imre/i915-noopt.ko > Cc: Imre Deak > Signed-off-by: Jani Nikula > --- > .../drm/i915/display/intel_display_power.c | 49 +++++++++------- > .../drm/i915/display/intel_display_power.h | 56 +++---------------- > 2 files changed, 37 insertions(+), 68 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_display_power.c b/drivers/gpu/drm/i915/display/intel_display_power.c > index 59dee2dc0552..fe94ef310f6b 100644 > --- a/drivers/gpu/drm/i915/display/intel_display_power.c > +++ b/drivers/gpu/drm/i915/display/intel_display_power.c > @@ -706,10 +706,10 @@ intel_display_power_put_async_work(struct work_struct *work) > * The power down is delayed by @delay_ms if this is >= 0, or by a default > * 100 ms otherwise. > */ > -void __intel_display_power_put_async(struct drm_i915_private *i915, > - enum intel_display_power_domain domain, > - intel_wakeref_t wakeref, > - int delay_ms) > +static void __intel_display_power_put_async(struct drm_i915_private *i915, > + enum intel_display_power_domain domain, > + intel_wakeref_t wakeref, > + int delay_ms) > { > struct i915_power_domains *power_domains = &i915->display.power.domains; > struct intel_runtime_pm *rpm = &i915->runtime_pm; > @@ -750,6 +750,27 @@ void __intel_display_power_put_async(struct drm_i915_private *i915, > intel_runtime_pm_put(rpm, wakeref); > } > > +void intel_display_power_put_async(struct drm_i915_private *i915, > + enum intel_display_power_domain domain, > + intel_wakeref_t wakeref) > +{ > + if (!IS_ENABLED(CONFIG_DRM_I915_DEBUG_RUNTIME_PM)) > + wakeref = INTEL_WAKEREF_DEF; > + > + __intel_display_power_put_async(i915, domain, wakeref, -1); > +} > + > +void intel_display_power_put_async_delay(struct drm_i915_private *i915, > + enum intel_display_power_domain domain, > + intel_wakeref_t wakeref, > + int delay_ms) > +{ > + if (!IS_ENABLED(CONFIG_DRM_I915_DEBUG_RUNTIME_PM)) > + wakeref = INTEL_WAKEREF_DEF; > + > + __intel_display_power_put_async(i915, domain, wakeref, delay_ms); > +} > + > /** > * intel_display_power_flush_work - flushes the async display power disabling work > * @i915: i915 device instance > @@ -807,7 +828,6 @@ intel_display_power_flush_work_sync(struct drm_i915_private *i915) > drm_WARN_ON(&i915->drm, power_domains->async_put_wakeref); > } > > -#if IS_ENABLED(CONFIG_DRM_I915_DEBUG_RUNTIME_PM) > /** > * intel_display_power_put - release a power domain reference > * @dev_priv: i915 device instance > @@ -818,6 +838,7 @@ intel_display_power_flush_work_sync(struct drm_i915_private *i915) > * intel_display_power_get() and might power down the corresponding hardware > * block right away if this is the last reference. > */ > +#if IS_ENABLED(CONFIG_DRM_I915_DEBUG_RUNTIME_PM) > void intel_display_power_put(struct drm_i915_private *dev_priv, > enum intel_display_power_domain domain, > intel_wakeref_t wakeref) > @@ -826,21 +847,9 @@ void intel_display_power_put(struct drm_i915_private *dev_priv, > intel_runtime_pm_put(&dev_priv->runtime_pm, wakeref); > } > #else > -/** > - * intel_display_power_put_unchecked - release an unchecked power domain reference > - * @dev_priv: i915 device instance > - * @domain: power domain to reference > - * > - * This function drops the power domain reference obtained by > - * intel_display_power_get() and might power down the corresponding hardware > - * block right away if this is the last reference. > - * > - * This function is only for the power domain code's internal use to suppress wakeref > - * tracking when the correspondig debug kconfig option is disabled, should not > - * be used otherwise. > - */ > -void intel_display_power_put_unchecked(struct drm_i915_private *dev_priv, > - enum intel_display_power_domain domain) > +void intel_display_power_put(struct drm_i915_private *dev_priv, > + enum intel_display_power_domain domain, > + intel_wakeref_t wakeref) > { > __intel_display_power_put(dev_priv, domain); > intel_runtime_pm_put_unchecked(&dev_priv->runtime_pm); > diff --git a/drivers/gpu/drm/i915/display/intel_display_power.h b/drivers/gpu/drm/i915/display/intel_display_power.h > index 688f3b60b5c5..c6bd4f122487 100644 > --- a/drivers/gpu/drm/i915/display/intel_display_power.h > +++ b/drivers/gpu/drm/i915/display/intel_display_power.h > @@ -190,60 +190,20 @@ intel_wakeref_t intel_display_power_get(struct drm_i915_private *dev_priv, > intel_wakeref_t > intel_display_power_get_if_enabled(struct drm_i915_private *dev_priv, > enum intel_display_power_domain domain); > -void __intel_display_power_put_async(struct drm_i915_private *i915, > - enum intel_display_power_domain domain, > - intel_wakeref_t wakeref, > - int delay_ms); > void intel_display_power_flush_work(struct drm_i915_private *i915); > -#if IS_ENABLED(CONFIG_DRM_I915_DEBUG_RUNTIME_PM) > + > void intel_display_power_put(struct drm_i915_private *dev_priv, > enum intel_display_power_domain domain, > intel_wakeref_t wakeref); > -static inline void > -intel_display_power_put_async(struct drm_i915_private *i915, > - enum intel_display_power_domain domain, > - intel_wakeref_t wakeref) > -{ > - __intel_display_power_put_async(i915, domain, wakeref, -1); > -} > > -static inline void > -intel_display_power_put_async_delay(struct drm_i915_private *i915, > - enum intel_display_power_domain domain, > - intel_wakeref_t wakeref, > - int delay_ms) > -{ > - __intel_display_power_put_async(i915, domain, wakeref, delay_ms); > -} > -#else > -void intel_display_power_put_unchecked(struct drm_i915_private *dev_priv, > - enum intel_display_power_domain domain); > +void intel_display_power_put_async(struct drm_i915_private *i915, > + enum intel_display_power_domain domain, > + intel_wakeref_t wakeref); > > -static inline void > -intel_display_power_put(struct drm_i915_private *i915, > - enum intel_display_power_domain domain, > - intel_wakeref_t wakeref) > -{ > - intel_display_power_put_unchecked(i915, domain); > -} > - > -static inline void > -intel_display_power_put_async(struct drm_i915_private *i915, > - enum intel_display_power_domain domain, > - intel_wakeref_t wakeref) > -{ > - __intel_display_power_put_async(i915, domain, INTEL_WAKEREF_DEF, -1); > -} > - > -static inline void > -intel_display_power_put_async_delay(struct drm_i915_private *i915, > - enum intel_display_power_domain domain, > - intel_wakeref_t wakeref, > - int delay_ms) > -{ > - __intel_display_power_put_async(i915, domain, INTEL_WAKEREF_DEF, delay_ms); > -} > -#endif > +void intel_display_power_put_async_delay(struct drm_i915_private *i915, > + enum intel_display_power_domain domain, > + intel_wakeref_t wakeref, > + int delay_ms); > > void > intel_display_power_get_in_set(struct drm_i915_private *i915, > -- > 2.39.5 >