summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGrygorii Strashko <Grygorii.Strashko@linaro.org>2015-01-23 17:43:37 +0200
committerGrygorii Strashko <Grygorii.Strashko@linaro.org>2015-02-09 23:28:42 +0800
commit25a3eaca0e6c20a5cf02c37b4ff89034915f3ac1 (patch)
treee7acee683c832e87ed4f65591fcd289c97cb772c
parent76eeb09e699059824d276cffed46a491961dd982 (diff)
[hib-new-ti] drm/omap: tiler: add hibernation callbacks
Setting a dev_pm_ops resume but not a set of hibernation functions means those pm functions will not be called upon hibernation. Fix this by using SIMPLE_DEV_PM_OPS, which appropriately assigns the suspend and hibernation handlers. Signed-off-by: Grygorii Strashko <Grygorii.Strashko@linaro.org>
-rw-r--r--drivers/gpu/drm/omapdrm/omap_dmm_tiler.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/gpu/drm/omapdrm/omap_dmm_tiler.c b/drivers/gpu/drm/omapdrm/omap_dmm_tiler.c
index ccf1bf06ceb..1e9d86c8ab3 100644
--- a/drivers/gpu/drm/omapdrm/omap_dmm_tiler.c
+++ b/drivers/gpu/drm/omapdrm/omap_dmm_tiler.c
@@ -965,7 +965,7 @@ error:
}
#endif
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
static int omap_dmm_resume(struct device *dev)
{
struct tcm_area area;
@@ -989,12 +989,10 @@ static int omap_dmm_resume(struct device *dev)
return 0;
}
-
-static const struct dev_pm_ops omap_dmm_pm_ops = {
- .resume = omap_dmm_resume,
-};
#endif
+SIMPLE_DEV_PM_OPS(omap_dmm_pm_ops, NULL, omap_dmm_resume);
+
#if defined(CONFIG_OF)
static const struct dmm_platform_data dmm_omap4_platform_data = {
.cpu_cache_flags = OMAP_BO_WC,