Commit 53d36818 authored by Paul Cercueil's avatar Paul Cercueil

drm: panfrost: Remove #ifdef guards for PM related functions

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: default avatarPaul Cercueil <paul@crapouillou.net>
Reviewed-by: default avatarSteven Price <steven.price@arm.com>
Acked-by: default avatarAlyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20221129191942.138244-3-paul@crapouillou.net
parent 10709aa8
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
#include <linux/reset.h> #include <linux/reset.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/pm_domain.h> #include <linux/pm_domain.h>
#include <linux/pm_runtime.h>
#include <linux/regulator/consumer.h> #include <linux/regulator/consumer.h>
#include "panfrost_device.h" #include "panfrost_device.h"
...@@ -400,8 +401,7 @@ void panfrost_device_reset(struct panfrost_device *pfdev) ...@@ -400,8 +401,7 @@ void panfrost_device_reset(struct panfrost_device *pfdev)
panfrost_job_enable_interrupts(pfdev); panfrost_job_enable_interrupts(pfdev);
} }
#ifdef CONFIG_PM static int panfrost_device_resume(struct device *dev)
int panfrost_device_resume(struct device *dev)
{ {
struct panfrost_device *pfdev = dev_get_drvdata(dev); struct panfrost_device *pfdev = dev_get_drvdata(dev);
...@@ -411,7 +411,7 @@ int panfrost_device_resume(struct device *dev) ...@@ -411,7 +411,7 @@ int panfrost_device_resume(struct device *dev)
return 0; 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); struct panfrost_device *pfdev = dev_get_drvdata(dev);
...@@ -423,4 +423,6 @@ int panfrost_device_suspend(struct device *dev) ...@@ -423,4 +423,6 @@ int panfrost_device_suspend(struct device *dev)
return 0; return 0;
} }
#endif
EXPORT_GPL_RUNTIME_DEV_PM_OPS(panfrost_pm_ops, panfrost_device_suspend,
panfrost_device_resume, NULL);
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
#include <linux/atomic.h> #include <linux/atomic.h>
#include <linux/io-pgtable.h> #include <linux/io-pgtable.h>
#include <linux/pm.h>
#include <linux/regulator/consumer.h> #include <linux/regulator/consumer.h>
#include <linux/spinlock.h> #include <linux/spinlock.h>
#include <drm/drm_device.h> #include <drm/drm_device.h>
...@@ -172,8 +173,7 @@ int panfrost_device_init(struct panfrost_device *pfdev); ...@@ -172,8 +173,7 @@ int panfrost_device_init(struct panfrost_device *pfdev);
void panfrost_device_fini(struct panfrost_device *pfdev); void panfrost_device_fini(struct panfrost_device *pfdev);
void panfrost_device_reset(struct panfrost_device *pfdev); void panfrost_device_reset(struct panfrost_device *pfdev);
int panfrost_device_resume(struct device *dev); extern const struct dev_pm_ops panfrost_pm_ops;
int panfrost_device_suspend(struct device *dev);
enum drm_panfrost_exception_type { enum drm_panfrost_exception_type {
DRM_PANFROST_EXCEPTION_OK = 0x00, DRM_PANFROST_EXCEPTION_OK = 0x00,
......
...@@ -676,17 +676,12 @@ static const struct of_device_id dt_match[] = { ...@@ -676,17 +676,12 @@ static const struct of_device_id dt_match[] = {
}; };
MODULE_DEVICE_TABLE(of, 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 = { static struct platform_driver panfrost_driver = {
.probe = panfrost_probe, .probe = panfrost_probe,
.remove = panfrost_remove, .remove = panfrost_remove,
.driver = { .driver = {
.name = "panfrost", .name = "panfrost",
.pm = &panfrost_pm_ops, .pm = pm_ptr(&panfrost_pm_ops),
.of_match_table = dt_match, .of_match_table = dt_match,
}, },
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment