From: Paul Cercueil <paul@crapouillou.net>
To: David Airlie <airlied@gmail.com>, Daniel Vetter <daniel@ffwll.ch>
Cc: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>,
intel-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org,
Paul Cercueil <paul@crapouillou.net>,
dri-devel@lists.freedesktop.org,
Rodrigo Vivi <rodrigo.vivi@intel.com>
Subject: [PATCH v2 26/26] drm/i915/gt: Remove #ifdef guards for PM related functions
Date: Tue, 29 Nov 2022 19:19:42 +0000 [thread overview]
Message-ID: <20221129191942.138244-13-paul@crapouillou.net> (raw)
In-Reply-To: <20221129191942.138244-1-paul@crapouillou.net>
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.
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 cf71305ad586..09b9365ededd 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, enum intel_rc6_res_type id)
{
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
WARNING: multiple messages have this Message-ID (diff)
From: Paul Cercueil <paul@crapouillou.net>
To: David Airlie <airlied@gmail.com>, Daniel Vetter <daniel@ffwll.ch>
Cc: intel-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org,
Paul Cercueil <paul@crapouillou.net>,
dri-devel@lists.freedesktop.org,
Rodrigo Vivi <rodrigo.vivi@intel.com>
Subject: [Intel-gfx] [PATCH v2 26/26] drm/i915/gt: Remove #ifdef guards for PM related functions
Date: Tue, 29 Nov 2022 19:19:42 +0000 [thread overview]
Message-ID: <20221129191942.138244-13-paul@crapouillou.net> (raw)
In-Reply-To: <20221129191942.138244-1-paul@crapouillou.net>
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.
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 cf71305ad586..09b9365ededd 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, enum intel_rc6_res_type id)
{
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
WARNING: multiple messages have this Message-ID (diff)
From: Paul Cercueil <paul@crapouillou.net>
To: David Airlie <airlied@gmail.com>, Daniel Vetter <daniel@ffwll.ch>
Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org,
Paul Cercueil <paul@crapouillou.net>,
Jani Nikula <jani.nikula@linux.intel.com>,
Joonas Lahtinen <joonas.lahtinen@linux.intel.com>,
Rodrigo Vivi <rodrigo.vivi@intel.com>,
Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>,
intel-gfx@lists.freedesktop.org
Subject: [PATCH v2 26/26] drm/i915/gt: Remove #ifdef guards for PM related functions
Date: Tue, 29 Nov 2022 19:19:42 +0000 [thread overview]
Message-ID: <20221129191942.138244-13-paul@crapouillou.net> (raw)
In-Reply-To: <20221129191942.138244-1-paul@crapouillou.net>
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.
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 cf71305ad586..09b9365ededd 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, enum intel_rc6_res_type id)
{
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
next prev parent reply other threads:[~2022-11-29 19:21 UTC|newest]
Thread overview: 90+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-29 19:17 [PATCH v2 00/26] drm: Get rid of #ifdef CONFIG_PM* guards Paul Cercueil
2022-11-29 19:17 ` Paul Cercueil
2022-11-29 19:17 ` [PATCH v2 01/26] drm: modeset-helper: Add DEFINE_DRM_MODE_CONFIG_HELPER_PM_OPS macro Paul Cercueil
2022-11-29 19:17 ` Paul Cercueil
2022-11-29 19:17 ` [PATCH v2 02/26] drm: bochs: Define and use generic PM ops Paul Cercueil
2022-11-29 19:17 ` Paul Cercueil
2022-11-29 19:17 ` [PATCH v2 03/26] drm: imx: " Paul Cercueil
2022-11-29 19:17 ` Paul Cercueil
2022-11-29 19:17 ` Paul Cercueil
2022-11-29 19:17 ` [PATCH v2 04/26] drm: rockchip: " Paul Cercueil
2022-11-29 19:17 ` Paul Cercueil
2022-11-29 19:17 ` Paul Cercueil
2022-11-29 19:17 ` Paul Cercueil
2022-11-29 19:17 ` [PATCH v2 05/26] drm: tegra: " Paul Cercueil
2022-11-29 19:17 ` Paul Cercueil
2022-11-29 19:17 ` [PATCH v2 06/26] drm: sun4i: " Paul Cercueil
2022-11-29 19:17 ` Paul Cercueil
2022-11-29 19:17 ` Paul Cercueil
2022-11-30 4:08 ` Samuel Holland
2022-11-30 4:08 ` Samuel Holland
2022-11-30 4:08 ` Samuel Holland
2022-11-29 19:17 ` [PATCH v2 07/26] drm: mxsfb: " Paul Cercueil
2022-11-29 19:17 ` Paul Cercueil
2022-11-29 19:17 ` Paul Cercueil
2022-11-29 21:48 ` Marek Vasut
2022-11-29 21:48 ` Marek Vasut
2022-11-29 21:48 ` Marek Vasut
2022-11-29 19:17 ` [PATCH v2 08/26] drm: atmel-hlcdc: Remove #ifdef guards for PM related functions Paul Cercueil
2022-11-29 19:17 ` Paul Cercueil
2022-11-29 19:17 ` Paul Cercueil
2022-11-29 19:17 ` [PATCH v2 09/26] drm: exynos: " Paul Cercueil
2022-11-29 19:17 ` Paul Cercueil
2022-11-29 19:17 ` Paul Cercueil
2022-11-29 19:17 ` [PATCH v2 10/26] drm: imx/dcss: " Paul Cercueil
2022-11-29 19:17 ` Paul Cercueil
2022-11-29 19:17 ` Paul Cercueil
2022-11-29 19:17 ` [PATCH v2 11/26] drm: bridge/dw-hdmi: " Paul Cercueil
2022-11-29 19:17 ` Paul Cercueil
2022-11-29 19:17 ` [PATCH v2 12/26] drm: etnaviv: " Paul Cercueil
2022-11-29 19:17 ` Paul Cercueil
2022-12-15 19:22 ` Lucas Stach
2022-12-15 19:22 ` Lucas Stach
2022-11-29 19:17 ` [PATCH v2 13/26] drm: fsl-dcu: " Paul Cercueil
2022-11-29 19:17 ` Paul Cercueil
2022-11-29 19:17 ` [PATCH v2 14/26] drm: mediatek: " Paul Cercueil
2022-11-29 19:17 ` Paul Cercueil
2022-11-29 19:17 ` Paul Cercueil
2022-11-29 19:19 ` Paul Cercueil
2022-11-29 19:19 ` Paul Cercueil
2022-11-29 19:19 ` Paul Cercueil
2022-11-29 19:19 ` [PATCH v2 15/26] drm: omap: " Paul Cercueil
2022-11-29 19:19 ` Paul Cercueil
2022-11-29 19:19 ` [PATCH v2 16/26] drm: panfrost: " Paul Cercueil
2022-11-29 19:19 ` Paul Cercueil
2022-11-29 19:54 ` Alyssa Rosenzweig
2022-11-29 19:54 ` Alyssa Rosenzweig
2022-11-29 19:19 ` [PATCH v2 17/26] drm: rcar-du: " Paul Cercueil
2022-11-29 19:19 ` Paul Cercueil
2022-11-29 19:43 ` Laurent Pinchart
2022-11-29 19:43 ` Laurent Pinchart
2022-11-29 21:05 ` Paul Cercueil
2022-11-29 21:05 ` Paul Cercueil
2022-11-29 21:24 ` Laurent Pinchart
2022-11-29 21:24 ` Laurent Pinchart
2022-11-29 19:19 ` [PATCH v2 18/26] drm: rockchip: " Paul Cercueil
2022-11-29 19:19 ` Paul Cercueil
2022-11-29 19:19 ` Paul Cercueil
2022-11-29 19:19 ` Paul Cercueil
2022-11-29 19:19 ` [PATCH v2 19/26] drm: shmobile: " Paul Cercueil
2022-11-29 19:19 ` Paul Cercueil
2022-11-29 19:44 ` Laurent Pinchart
2022-11-29 19:44 ` Laurent Pinchart
2022-11-29 19:19 ` [PATCH v2 20/26] drm: tegra: " Paul Cercueil
2022-11-29 19:19 ` Paul Cercueil
2022-11-29 19:19 ` [PATCH v2 21/26] drm: tilcdc: " Paul Cercueil
2022-11-29 19:19 ` Paul Cercueil
2022-11-29 19:19 ` [PATCH v2 22/26] drm: vboxvideo: " Paul Cercueil
2022-11-29 19:19 ` Paul Cercueil
2022-11-29 19:19 ` [PATCH v2 23/26] drm: vc4: " Paul Cercueil
2022-11-29 19:19 ` Paul Cercueil
2022-11-29 19:19 ` [PATCH v2 24/26] drm: gm12u320: " Paul Cercueil
2022-11-29 19:19 ` Paul Cercueil
2022-11-29 19:19 ` [PATCH v2 25/26] drm: tidss: " Paul Cercueil
2022-11-29 19:19 ` Paul Cercueil
2022-11-29 19:19 ` Paul Cercueil [this message]
2022-11-29 19:19 ` [PATCH v2 26/26] drm/i915/gt: " Paul Cercueil
2022-11-29 19:19 ` [Intel-gfx] " Paul Cercueil
2022-12-07 15:56 ` Rodrigo Vivi
2022-12-07 15:56 ` Rodrigo Vivi
2022-12-07 15:56 ` Rodrigo Vivi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221129191942.138244-13-paul@crapouillou.net \
--to=paul@crapouillou.net \
--cc=airlied@gmail.com \
--cc=daniel@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=linux-kernel@vger.kernel.org \
--cc=rodrigo.vivi@intel.com \
--cc=tvrtko.ursulin@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.