From: Paul Cercueil <paul@crapouillou.net> To: David Airlie <airlied@gmail.com>, Daniel Vetter <daniel@ffwll.ch> Cc: Tomeu Vizoso <tomeu.vizoso@collabora.com>, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Steven Price <steven.price@arm.com>, Paul Cercueil <paul@crapouillou.net>, Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com> Subject: [PATCH v2 16/26] drm: panfrost: Remove #ifdef guards for PM related functions Date: Tue, 29 Nov 2022 19:19:32 +0000 [thread overview] Message-ID: <20221129191942.138244-3-paul@crapouillou.net> (raw) In-Reply-To: <20221129191942.138244-1-paul@crapouillou.net> Use the EXPORT_GPL_RUNTIME_DEV_PM_OPS() and pm_ptr() macros to handle the PM callbacks. These macros allow the PM functions to be automatically dropped by the compiler 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> Reviewed-by: Steven Price <steven.price@arm.com> --- Cc: Rob Herring <robh@kernel.org> Cc: Tomeu Vizoso <tomeu.vizoso@collabora.com> Cc: Steven Price <steven.price@arm.com> Cc: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com> --- drivers/gpu/drm/panfrost/panfrost_device.c | 10 ++++++---- drivers/gpu/drm/panfrost/panfrost_device.h | 4 ++-- drivers/gpu/drm/panfrost/panfrost_drv.c | 7 +------ 3 files changed, 9 insertions(+), 12 deletions(-) diff --git a/drivers/gpu/drm/panfrost/panfrost_device.c b/drivers/gpu/drm/panfrost/panfrost_device.c index ee612303f076..fa1a086a862b 100644 --- a/drivers/gpu/drm/panfrost/panfrost_device.c +++ b/drivers/gpu/drm/panfrost/panfrost_device.c @@ -6,6 +6,7 @@ #include <linux/reset.h> #include <linux/platform_device.h> #include <linux/pm_domain.h> +#include <linux/pm_runtime.h> #include <linux/regulator/consumer.h> #include "panfrost_device.h" @@ -400,8 +401,7 @@ void panfrost_device_reset(struct panfrost_device *pfdev) panfrost_job_enable_interrupts(pfdev); } -#ifdef CONFIG_PM -int panfrost_device_resume(struct device *dev) +static int panfrost_device_resume(struct device *dev) { struct panfrost_device *pfdev = dev_get_drvdata(dev); @@ -411,7 +411,7 @@ int panfrost_device_resume(struct device *dev) return 0; } -int panfrost_device_suspend(struct device *dev) +static int panfrost_device_suspend(struct device *dev) { struct panfrost_device *pfdev = dev_get_drvdata(dev); @@ -423,4 +423,6 @@ int panfrost_device_suspend(struct device *dev) return 0; } -#endif + +EXPORT_GPL_RUNTIME_DEV_PM_OPS(panfrost_pm_ops, panfrost_device_suspend, + panfrost_device_resume, NULL); diff --git a/drivers/gpu/drm/panfrost/panfrost_device.h b/drivers/gpu/drm/panfrost/panfrost_device.h index 8b25278f34c8..d9ba68cffb77 100644 --- a/drivers/gpu/drm/panfrost/panfrost_device.h +++ b/drivers/gpu/drm/panfrost/panfrost_device.h @@ -7,6 +7,7 @@ #include <linux/atomic.h> #include <linux/io-pgtable.h> +#include <linux/pm.h> #include <linux/regulator/consumer.h> #include <linux/spinlock.h> #include <drm/drm_device.h> @@ -172,8 +173,7 @@ int panfrost_device_init(struct panfrost_device *pfdev); void panfrost_device_fini(struct panfrost_device *pfdev); void panfrost_device_reset(struct panfrost_device *pfdev); -int panfrost_device_resume(struct device *dev); -int panfrost_device_suspend(struct device *dev); +extern const struct dev_pm_ops panfrost_pm_ops; enum drm_panfrost_exception_type { DRM_PANFROST_EXCEPTION_OK = 0x00, diff --git a/drivers/gpu/drm/panfrost/panfrost_drv.c b/drivers/gpu/drm/panfrost/panfrost_drv.c index 2fa5afe21288..fa619fe72086 100644 --- a/drivers/gpu/drm/panfrost/panfrost_drv.c +++ b/drivers/gpu/drm/panfrost/panfrost_drv.c @@ -676,17 +676,12 @@ static const struct of_device_id dt_match[] = { }; MODULE_DEVICE_TABLE(of, dt_match); -static const struct dev_pm_ops panfrost_pm_ops = { - SET_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend, pm_runtime_force_resume) - SET_RUNTIME_PM_OPS(panfrost_device_suspend, panfrost_device_resume, NULL) -}; - static struct platform_driver panfrost_driver = { .probe = panfrost_probe, .remove = panfrost_remove, .driver = { .name = "panfrost", - .pm = &panfrost_pm_ops, + .pm = pm_ptr(&panfrost_pm_ops), .of_match_table = dt_match, }, }; -- 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>, Steven Price <steven.price@arm.com>, Rob Herring <robh@kernel.org>, Tomeu Vizoso <tomeu.vizoso@collabora.com>, Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com> Subject: [PATCH v2 16/26] drm: panfrost: Remove #ifdef guards for PM related functions Date: Tue, 29 Nov 2022 19:19:32 +0000 [thread overview] Message-ID: <20221129191942.138244-3-paul@crapouillou.net> (raw) In-Reply-To: <20221129191942.138244-1-paul@crapouillou.net> Use the EXPORT_GPL_RUNTIME_DEV_PM_OPS() and pm_ptr() macros to handle the PM callbacks. These macros allow the PM functions to be automatically dropped by the compiler 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> Reviewed-by: Steven Price <steven.price@arm.com> --- Cc: Rob Herring <robh@kernel.org> Cc: Tomeu Vizoso <tomeu.vizoso@collabora.com> Cc: Steven Price <steven.price@arm.com> Cc: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com> --- drivers/gpu/drm/panfrost/panfrost_device.c | 10 ++++++---- drivers/gpu/drm/panfrost/panfrost_device.h | 4 ++-- drivers/gpu/drm/panfrost/panfrost_drv.c | 7 +------ 3 files changed, 9 insertions(+), 12 deletions(-) diff --git a/drivers/gpu/drm/panfrost/panfrost_device.c b/drivers/gpu/drm/panfrost/panfrost_device.c index ee612303f076..fa1a086a862b 100644 --- a/drivers/gpu/drm/panfrost/panfrost_device.c +++ b/drivers/gpu/drm/panfrost/panfrost_device.c @@ -6,6 +6,7 @@ #include <linux/reset.h> #include <linux/platform_device.h> #include <linux/pm_domain.h> +#include <linux/pm_runtime.h> #include <linux/regulator/consumer.h> #include "panfrost_device.h" @@ -400,8 +401,7 @@ void panfrost_device_reset(struct panfrost_device *pfdev) panfrost_job_enable_interrupts(pfdev); } -#ifdef CONFIG_PM -int panfrost_device_resume(struct device *dev) +static int panfrost_device_resume(struct device *dev) { struct panfrost_device *pfdev = dev_get_drvdata(dev); @@ -411,7 +411,7 @@ int panfrost_device_resume(struct device *dev) return 0; } -int panfrost_device_suspend(struct device *dev) +static int panfrost_device_suspend(struct device *dev) { struct panfrost_device *pfdev = dev_get_drvdata(dev); @@ -423,4 +423,6 @@ int panfrost_device_suspend(struct device *dev) return 0; } -#endif + +EXPORT_GPL_RUNTIME_DEV_PM_OPS(panfrost_pm_ops, panfrost_device_suspend, + panfrost_device_resume, NULL); diff --git a/drivers/gpu/drm/panfrost/panfrost_device.h b/drivers/gpu/drm/panfrost/panfrost_device.h index 8b25278f34c8..d9ba68cffb77 100644 --- a/drivers/gpu/drm/panfrost/panfrost_device.h +++ b/drivers/gpu/drm/panfrost/panfrost_device.h @@ -7,6 +7,7 @@ #include <linux/atomic.h> #include <linux/io-pgtable.h> +#include <linux/pm.h> #include <linux/regulator/consumer.h> #include <linux/spinlock.h> #include <drm/drm_device.h> @@ -172,8 +173,7 @@ int panfrost_device_init(struct panfrost_device *pfdev); void panfrost_device_fini(struct panfrost_device *pfdev); void panfrost_device_reset(struct panfrost_device *pfdev); -int panfrost_device_resume(struct device *dev); -int panfrost_device_suspend(struct device *dev); +extern const struct dev_pm_ops panfrost_pm_ops; enum drm_panfrost_exception_type { DRM_PANFROST_EXCEPTION_OK = 0x00, diff --git a/drivers/gpu/drm/panfrost/panfrost_drv.c b/drivers/gpu/drm/panfrost/panfrost_drv.c index 2fa5afe21288..fa619fe72086 100644 --- a/drivers/gpu/drm/panfrost/panfrost_drv.c +++ b/drivers/gpu/drm/panfrost/panfrost_drv.c @@ -676,17 +676,12 @@ static const struct of_device_id dt_match[] = { }; MODULE_DEVICE_TABLE(of, dt_match); -static const struct dev_pm_ops panfrost_pm_ops = { - SET_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend, pm_runtime_force_resume) - SET_RUNTIME_PM_OPS(panfrost_device_suspend, panfrost_device_resume, NULL) -}; - static struct platform_driver panfrost_driver = { .probe = panfrost_probe, .remove = panfrost_remove, .driver = { .name = "panfrost", - .pm = &panfrost_pm_ops, + .pm = pm_ptr(&panfrost_pm_ops), .of_match_table = dt_match, }, }; -- 2.35.1
next prev parent reply other threads:[~2022-11-29 19:20 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 ` Paul Cercueil [this message] 2022-11-29 19:19 ` [PATCH v2 16/26] drm: panfrost: " 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 ` [PATCH v2 26/26] drm/i915/gt: " Paul Cercueil 2022-11-29 19:19 ` 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-3-paul@crapouillou.net \ --to=paul@crapouillou.net \ --cc=airlied@gmail.com \ --cc=alyssa.rosenzweig@collabora.com \ --cc=daniel@ffwll.ch \ --cc=dri-devel@lists.freedesktop.org \ --cc=linux-kernel@vger.kernel.org \ --cc=steven.price@arm.com \ --cc=tomeu.vizoso@collabora.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: linkBe 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.