Received: by 2002:a05:6358:d09b:b0:dc:cd0c:909e with SMTP id jc27csp2437766rwb; Mon, 7 Nov 2022 13:19:00 -0800 (PST) X-Google-Smtp-Source: AMsMyM6YemRmWmedomMzNvetcp64yXMfdTtD1PwuqyYnoWi/pm47jrorajIIJuC5NL3yVxQgg0Jt X-Received: by 2002:aa7:c58e:0:b0:461:77b:7bd with SMTP id g14-20020aa7c58e000000b00461077b07bdmr52871328edq.387.1667855940050; Mon, 07 Nov 2022 13:19:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1667855940; cv=none; d=google.com; s=arc-20160816; b=Uq6LtUcH8EVBJZI/3eiw4TfBLEufdP6ZymVfUGAAuHV35/UdBUWAn+ORsqPU4h0JLC bhIOF2KzfrfjVKmbApwZfmC7VxNtiUWbSez4ClU6JPpPH5KBdZYbl/GB2w49heewgtOt IeyYfBWmBLtK90gBvlLrQfdv/m9XrSgtS14xndIaBtAv/1pHWmjigMC65kPttfr4UwFA TPCDZC2WPpMJ92zeGS4QHXqf9IYtkiSDCAId3Iv6kyiizRTidimnxuYrLO9My1sZut/t Dkbe23JOcMDgevExsFnWmjmBrvapgF373LAPHdeBvCqnoQH+ZMUJtmzsdvqpahlWHFpY MyNg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:cc:to:subject:from:date :dkim-signature; bh=AInEwYmBubDQ6V6OhoS8/DlKJ2T55utDNAWwTZfVpEs=; b=oIjVA8lPua3Zs0wips1b4cuZ/fBLXW1ziBMREkfgGqBKSGqAmi9KH0eK4ZwMJjE1ip R5kuS5ls5tIkUpF9EYdqMrhCEUHGwpSV5qjqgrcqGYU8mhvsO0DLNKcO+yZrG4CIsfSN I67wRH6vkfcvOIZFUnh/uPL2sNDgaznB0Uxk2rViIABAdEUeBfJp9OkK1oN2SxMBY5ym PraBZHZZ9HDeZJzIAsMjqtBXdqtVFNlmCXCiYyMilxQ3ncmUe4quZpMQWHIpySsocFr1 Tj6bqlFwVYbg8RatU40aw3npJoh/xh1Qul02BUgF4EPR9x2Hs/W+Oqgpm6CHpMUUTh5i tFSg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@crapouillou.net header.s=mail header.b=jBWCwoey; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=crapouillou.net Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id sg10-20020a170907a40a00b0079e925b0200si11652608ejc.59.2022.11.07.13.18.37; Mon, 07 Nov 2022 13:19:00 -0800 (PST) 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; Authentication-Results: mx.google.com; dkim=pass header.i=@crapouillou.net header.s=mail header.b=jBWCwoey; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=crapouillou.net Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233133AbiKGVAK (ORCPT + 92 others); Mon, 7 Nov 2022 16:00:10 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47642 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232661AbiKGVAJ (ORCPT ); Mon, 7 Nov 2022 16:00:09 -0500 Received: from aposti.net (aposti.net [89.234.176.197]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A91DF254 for ; Mon, 7 Nov 2022 13:00:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=crapouillou.net; s=mail; t=1667854806; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=AInEwYmBubDQ6V6OhoS8/DlKJ2T55utDNAWwTZfVpEs=; b=jBWCwoeyZYRizpyaR+kfAx7UlmgKvWtEqzqgW0CK2RuM7UTF6Uv3LcDseUJt+2VtHoYFpv Kcue/ozBs2v7BF75dXwjLfqT/omGKYDVxxYTKd0MOaF3HDVxK2b1r5njQM+sLu5SPcsVYg AGbmaf1bxY/RQg6jP0MxmEoWmo+ZZvo= Date: Mon, 07 Nov 2022 20:59:55 +0000 From: Paul Cercueil Subject: Re: [PATCH 26/26] drm/i915/gt: Remove #ifdef guards for PM related functions To: Rodrigo Vivi Cc: Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Daniel Vetter , Tvrtko Ursulin , intel-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org Message-Id: In-Reply-To: References: <20221107175106.360578-1-paul@crapouillou.net> <20221107175510.361051-1-paul@crapouillou.net> <20221107175510.361051-3-paul@crapouillou.net> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1; format=flowed Content-Transfer-Encoding: quoted-printable X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_PASS,SPF_PASS 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: X-Mailing-List: linux-kernel@vger.kernel.org Hi Rodrigo, Le lun. 7 nov. 2022 =E0 15:31:49 -0500, Rodrigo Vivi=20 a =E9crit : > 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=20 >> each >> value of CONFIG_PM, add a check on !IS_ENABLED(CONFIG_PM) early in=20 >> the >> function. This will allow the compiler to automatically drop the=20 >> dead >> code when CONFIG_PM is disabled, without having to use #ifdef=20 >> guards. >=20 > 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. I don't know anything about i915, so the best I can do is update the=20 code without changing the functionality. Then someone with a better understanding can send a patch to remove the=20 check on CONFIG_PM. Cheers, -Paul >>=20 >> 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. >>=20 >> Signed-off-by: Paul Cercueil >> --- >> Cc: Jani Nikula >> Cc: Joonas Lahtinen >> Cc: Rodrigo Vivi >> Cc: Tvrtko Ursulin >> Cc: intel-gfx@lists.freedesktop.org >> --- >> drivers/gpu/drm/i915/gt/intel_gt_sysfs_pm.c | 8 +------- >> 1 file changed, 1 insertion(+), 7 deletions(-) >>=20 >> diff --git a/drivers/gpu/drm/i915/gt/intel_gt_sysfs_pm.c=20 >> 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,=20 >> struct attribute *attr, >> NULL); \ >> INTEL_GT_ATTR_RO(_name) >>=20 >> -#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=20 >> intel_gt *gt, struct kobject *kobj) >> { >> int ret; >>=20 >> - if (!HAS_RC6(gt->i915)) >> + if (!IS_ENABLED(CONFIG_PM) || !HAS_RC6(gt->i915)) >> return; >>=20 >> ret =3D __intel_gt_sysfs_create_group(kobj, rc6_attr_group); >> @@ -329,11 +328,6 @@ static void intel_sysfs_rc6_init(struct=20 >> intel_gt *gt, struct kobject *kobj) >> gt->info.id, ERR_PTR(ret)); >> } >> } >> -#else >> -static void intel_sysfs_rc6_init(struct intel_gt *gt, struct=20 >> kobject *kobj) >> -{ >> -} >> -#endif /* CONFIG_PM */ >>=20 >> static u32 __act_freq_mhz_show(struct intel_gt *gt) >> { >> -- >> 2.35.1 >>=20