Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Mon, 7 Nov 2022 15:31:49 -0500
From:   Rodrigo Vivi <rodrigo.vivi@intel.com>
To:     Paul Cercueil <paul@crapouillou.net>
CC:     Maarten Lankhorst <maarten.lankhorst@linux.intel.com>,
        Maxime Ripard <mripard@kernel.org>,
        Thomas Zimmermann <tzimmermann@suse.de>,
        David Airlie <airlied@gmail.com>,
        Daniel Vetter <daniel@ffwll.ch>,
        Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>,
        <intel-gfx@lists.freedesktop.org>, <linux-kernel@vger.kernel.org>,
        <dri-devel@lists.freedesktop.org>
Subject: Re: [PATCH 26/26] drm/i915/gt: Remove #ifdef guards for PM related
 functions
Message-ID: <Y2lrNbA4t8RHOwPB@intel.com>
References: <20221107175106.360578-1-paul@crapouillou.net>
 <20221107175510.361051-1-paul@crapouillou.net>
 <20221107175510.361051-3-paul@crapouillou.net>
Content-Type: text/plain; charset="us-ascii"
Content-Disposition: inline
In-Reply-To: <20221107175510.361051-3-paul@crapouillou.net>
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?RWrVv/fqI91uuCiP2zX2Db9ZYwl74H6PbQHWehCXggXDFL3GlweCVGDiD6Jz?=
 =?us-ascii?Q?Jhr4Dup6c2FlXiYEsIpMi8sFR5yl004FIAgVRF253QQZ9tro+bw6zNjdfprX?=
 =?us-ascii?Q?RE2tgx+5jnp/+6KBNzp9VGROyyTJsYc/RdTpSocnzNAtXzpDxxBo51xmJ7ih?=
 =?us-ascii?Q?CJFbPT+YgdOnCFFG4aDO/pU5YDJcEcfs0qMcK1l3p2b4JGbwSdyV05Xn6F+F?=
 =?us-ascii?Q?8Dy50srx6G3rBdWSsyGAD/1OBbn3Ij65RwTfy8KVK5pVlHprMan3a6MLr9Fd?=
 =?us-ascii?Q?j3X/OofBzqFtv5Fb/w8TkmPTIN9VUEtXnu1b6N1JzwNYXibR7tMrr5PRgxPt?=
 =?us-ascii?Q?x3m1EiGhO3zXAnfLTG+pprK4x3/Q7bmKHD7XQP+7fhOrtLcSj46Yrx7U/Dvf?=
 =?us-ascii?Q?DwV9qIfIebECT0hFQWNeFxdhzf/OHoZpcQh5rsrt5r4RzSrfbyQ3j4C6jAcp?=
 =?us-ascii?Q?VjUNNVCu15qTF8j0f+amj1r6XnfRFPH6enWO9VMWeQMlyfJoz7acRTO1wX8d?=
 =?us-ascii?Q?FbqX56ET3qXKyULSo4Qi581fFNQLXjqAqIOgmHQWTDBqxI3t0BnDllK6dK/1?=
 =?us-ascii?Q?J0rMNS22oEQ3UlyDk/jkkLPgU+T5a6hzgD6Mb04h+OV5MyCn1KJ5r7TfhmGo?=
 =?us-ascii?Q?s4J6X4aLuGwF6QoooAe38Vlr02EIXHe3Grq3dQHC4rr96vSkVBJpuzWrA/76?=
 =?us-ascii?Q?JEwG++hXQds1znLWqcoW5asYR6ObrJn3SlOkSuukCP0lc6NcP2xS4AA4I8v1?=
 =?us-ascii?Q?6qN29A3UxyrHR3gWEQkvzKmqYTbgkSldrVG2SOIzzGEaBigJVura3TOzskof?=
 =?us-ascii?Q?wGjMhm4jW5T1N7a39JoBNJBoLD8pRODkRaAIdoSItf+hIRzSN0uOxLufRRX9?=
 =?us-ascii?Q?Gg+mgfhe5CPB2R+TfPDlz7YmQYAbXCDL2qdPB3BZuDG+SThzNvtPU+nVLdrI?=
 =?us-ascii?Q?OJVGwfV0tO7Vr0z5jMULGJ1n3fIw3Kmbx+uc88YJW+grwFbzALOA+ywy1wHV?=
 =?us-ascii?Q?HQ8QAoIRpYqfcNM5oT20PxSywSXcZ9WSej2ZaiYATVO274yxJ+4DVJV9KZJK?=
 =?us-ascii?Q?i8Q+yW/4cC7Kms7TvNZj8h5Rk83qKW6NxC6vNbvap61IfsBd+3+oV8s6O1N2?=
 =?us-ascii?Q?YOhLIQ7/TasVtSDgKU+pySHAe09MrahpKC8duZcJWnfKfAWerXmKVNfh/AQD?=
 =?us-ascii?Q?Vh+p5EHV+/1PfNL+u90nDATRtGhBTqx5RQDvw3XVL4O/2uLc29YEvFeZLYm+?=
 =?us-ascii?Q?P/yPZgqjdInHmJqtNlMSQZU6nYObE9L+EgGD0Oqm0YE1Go5LnGiTmdbQPOwB?=
 =?us-ascii?Q?1QqGbOIPfZ/WzLbEaRntdsrtzfNrsIzeSTT8PL6G4RIajGpOZET4qOHVGFQI?=
 =?us-ascii?Q?OeyAS5TqaSTa21AvUVTDT4zbFW/1yQNcI/qTmtLqR9DU8E8tj5JK02X8kgXU?=
 =?us-ascii?Q?AMQV+jlHGUGs047HRPqa8S0a9MSsiagzNNt3wELJeMkJZgJf3WD0YKEFGbEY?=
 =?us-ascii?Q?lc64kRQTfPXTjhwmV3XbZZsFT/r9zSqZKTxQC1318lhILKJ/tcRNWH8Gtbmj?=
 =?us-ascii?Q?uvHnlwlIYdBG0Nu0qBVo6Q6c/QMgatkjLxTxFHNI+z9o3de6jdCbCOqZkRXU?=
 =?us-ascii?Q?JQ=3D=3D?=
X-MS-Exchange-CrossTenant-Network-Message-Id: 86c854e7-681b-44b5-9b25-08dac0ff1c42
X-MS-Exchange-CrossTenant-AuthSource: MN0PR11MB6059.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Nov 2022 20:31:55.2010
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: wtLMxda3prJVzHp8AxjIoVCZ5ZCL+sc2pzrZ87zIstPmH6zgHrAm8Yd/vG4g7zvwzDAJlNmfYwXIMFZ+icRJbA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA2PR11MB5130
X-OriginatorOrg: intel.com
X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,
        DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,
        SPF_HELO_NONE,SPF_NONE autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Mon, Nov 07, 2022 at 05:55:10PM +0000, Paul Cercueil wrote:
> Instead of defining two versions of intel_sysfs_rc6_init(), one for each
> value of CONFIG_PM, add a check on !IS_ENABLED(CONFIG_PM) early in the
> function. This will allow the compiler to automatically drop the dead
> code when CONFIG_PM is disabled, without having to use #ifdef guards.

Making the RC6 to depend on the CONFIG_PM is probably an historical
mistake and probably the right solution is simply to remove that
dependency.

> 
> This has the advantage of always compiling these functions in,
> independently of any Kconfig option. Thanks to that, bugs and other
> regressions are subsequently easier to catch.
> 
> Signed-off-by: Paul Cercueil <paul@crapouillou.net>
> ---
> Cc: Jani Nikula <jani.nikula@linux.intel.com>
> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
> Cc: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
> Cc: intel-gfx@lists.freedesktop.org
> ---
>  drivers/gpu/drm/i915/gt/intel_gt_sysfs_pm.c | 8 +-------
>  1 file changed, 1 insertion(+), 7 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/gt/intel_gt_sysfs_pm.c b/drivers/gpu/drm/i915/gt/intel_gt_sysfs_pm.c
> index 2b5f05b31187..decf892a4508 100644
> --- a/drivers/gpu/drm/i915/gt/intel_gt_sysfs_pm.c
> +++ b/drivers/gpu/drm/i915/gt/intel_gt_sysfs_pm.c
> @@ -164,7 +164,6 @@ sysfs_gt_attribute_r_func(struct kobject *kobj, struct attribute *attr,
>  								 NULL);			\
>  	INTEL_GT_ATTR_RO(_name)
>  
> -#ifdef CONFIG_PM
>  static u32 get_residency(struct intel_gt *gt, i915_reg_t reg)
>  {
>  	intel_wakeref_t wakeref;
> @@ -300,7 +299,7 @@ static void intel_sysfs_rc6_init(struct intel_gt *gt, struct kobject *kobj)
>  {
>  	int ret;
>  
> -	if (!HAS_RC6(gt->i915))
> +	if (!IS_ENABLED(CONFIG_PM) || !HAS_RC6(gt->i915))
>  		return;
>  
>  	ret = __intel_gt_sysfs_create_group(kobj, rc6_attr_group);
> @@ -329,11 +328,6 @@ static void intel_sysfs_rc6_init(struct intel_gt *gt, struct kobject *kobj)
>  				 gt->info.id, ERR_PTR(ret));
>  	}
>  }
> -#else
> -static void intel_sysfs_rc6_init(struct intel_gt *gt, struct kobject *kobj)
> -{
> -}
> -#endif /* CONFIG_PM */
>  
>  static u32 __act_freq_mhz_show(struct intel_gt *gt)
>  {
> -- 
> 2.35.1
>