summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeonard Crestez <leonard.crestez@nxp.com>2018-09-17 16:42:14 +0300
committerJason Liu <jason.hui.liu@nxp.com>2019-02-12 10:35:05 +0800
commit2c12c2336a2be7a99bd51cf584294346b1ff39d1 (patch)
tree2e99c6ca284f5dc960fd20cd71d150699fc4c8fe
parent3f40d3515ce8901f7a928cf0a5d220845e213004 (diff)
MLK-20181-6: drm/mxsfb: Add PM_SLEEP support
Since power to the lcdif block can be lost on suspend implement PM_SLEEP_OPS using drm_mode_config_helper_suspend/resume to save/restore the current mode. Signed-off-by: Leonard Crestez <leonard.crestez@nxp.com> Reviewed-by: Stefan Agner <stefan@agner.ch> Reviewed-by: Sean Paul <seanpaul@chromium.org> Signed-off-by: Stefan Agner <stefan@agner.ch> Link: https://patchwork.freedesktop.org/patch/msgid/cfa1a4083eefd112362e640deeb2e120584ac3f5.1537191359.git.leonard.crestez@nxp.com
-rw-r--r--drivers/gpu/drm/mxsfb/mxsfb_drv.c52
1 files changed, 4 insertions, 48 deletions
diff --git a/drivers/gpu/drm/mxsfb/mxsfb_drv.c b/drivers/gpu/drm/mxsfb/mxsfb_drv.c
index 46df81b1b3a9..46ad4c1ba6cc 100644
--- a/drivers/gpu/drm/mxsfb/mxsfb_drv.c
+++ b/drivers/gpu/drm/mxsfb/mxsfb_drv.c
@@ -548,67 +548,23 @@ static int mxsfb_remove(struct platform_device *pdev)
return 0;
}
-#ifdef CONFIG_PM
-static int mxsfb_runtime_suspend(struct device *dev)
-{
- struct drm_device *drm = dev_get_drvdata(dev);
- struct mxsfb_drm_private *mxsfb = drm->dev_private;
-
- if (!drm->registered)
- return 0;
-
- if (mxsfb->enabled) {
- mxsfb_crtc_disable(mxsfb);
- mxsfb->suspended = true;
- }
-
- return 0;
-}
-
-static int mxsfb_runtime_resume(struct device *dev)
-{
- struct drm_device *drm = dev_get_drvdata(dev);
- struct mxsfb_drm_private *mxsfb = drm->dev_private;
-
- if (!drm->registered || !mxsfb->suspended)
- return 0;
-
- mxsfb_crtc_enable(mxsfb);
- mxsfb->suspended = false;
-
- return 0;
-}
-
+#ifdef CONFIG_PM_SLEEP
static int mxsfb_suspend(struct device *dev)
{
struct drm_device *drm = dev_get_drvdata(dev);
- struct mxsfb_drm_private *mxsfb = drm->dev_private;
-
- if (mxsfb->enabled) {
- mxsfb_crtc_disable(mxsfb);
- mxsfb->suspended = true;
- }
- return 0;
+ return drm_mode_config_helper_suspend(drm);
}
static int mxsfb_resume(struct device *dev)
{
struct drm_device *drm = dev_get_drvdata(dev);
- struct mxsfb_drm_private *mxsfb = drm->dev_private;
-
- if (!mxsfb->suspended)
- return 0;
- mxsfb_crtc_enable(mxsfb);
- mxsfb->suspended = false;
-
- return 0;
+ return drm_mode_config_helper_resume(drm);
}
#endif
static const struct dev_pm_ops mxsfb_pm_ops = {
- SET_RUNTIME_PM_OPS(mxsfb_runtime_suspend, mxsfb_runtime_resume, NULL)
SET_SYSTEM_SLEEP_PM_OPS(mxsfb_suspend, mxsfb_resume)
};
@@ -619,7 +575,7 @@ static struct platform_driver mxsfb_platform_driver = {
.driver = {
.name = "mxsfb_drm",
.of_match_table = mxsfb_dt_ids,
- .pm = &mxsfb_pm_ops,
+ .pm = &mxsfb_pm_ops,
},
};