From d3af506328af97e769660939509dde6e93065a61 Mon Sep 17 00:00:00 2001 From: Patrik Jakobsson Date: Sat, 6 Apr 2013 00:45:22 +0200 Subject: [PATCH] --- yaml --- r: 371431 b: refs/heads/master c: 888eef2e8c2d9fc2e6ccf58fb4a8f9f6d8ff9a22 h: refs/heads/master i: 371429: ceca3ebff5e32a40d9563222097407c11bf9eb37 371427: ea0e907b2537eacc39c3a8609ae69bcbb47661fe 371423: 1c7f9a5703b2d3e90b395498a5792679a441775b v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/gma500/power.c | 15 +++++++++++++++ trunk/drivers/gpu/drm/gma500/power.h | 3 +++ trunk/drivers/gpu/drm/gma500/psb_drv.c | 3 +++ 4 files changed, 22 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 1f8ec10082be..2234db291438 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8ba8209fefb67edf2ecbb92e9f16008bfaa1b031 +refs/heads/master: 888eef2e8c2d9fc2e6ccf58fb4a8f9f6d8ff9a22 diff --git a/trunk/drivers/gpu/drm/gma500/power.c b/trunk/drivers/gpu/drm/gma500/power.c index 4c575a9a9c81..b6b135fcd59c 100644 --- a/trunk/drivers/gpu/drm/gma500/power.c +++ b/trunk/drivers/gpu/drm/gma500/power.c @@ -315,3 +315,18 @@ int psb_runtime_idle(struct device *dev) else return 1; } + +int gma_power_thaw(struct device *_dev) +{ + return gma_power_resume(_dev); +} + +int gma_power_freeze(struct device *_dev) +{ + return gma_power_suspend(_dev); +} + +int gma_power_restore(struct device *_dev) +{ + return gma_power_resume(_dev); +} diff --git a/trunk/drivers/gpu/drm/gma500/power.h b/trunk/drivers/gpu/drm/gma500/power.h index 1969d2ecb328..56d8708bd41c 100644 --- a/trunk/drivers/gpu/drm/gma500/power.h +++ b/trunk/drivers/gpu/drm/gma500/power.h @@ -41,6 +41,9 @@ void gma_power_uninit(struct drm_device *dev); */ int gma_power_suspend(struct device *dev); int gma_power_resume(struct device *dev); +int gma_power_thaw(struct device *dev); +int gma_power_freeze(struct device *dev); +int gma_power_restore(struct device *_dev); /* * These are the functions the driver should use to wrap all hw access diff --git a/trunk/drivers/gpu/drm/gma500/psb_drv.c b/trunk/drivers/gpu/drm/gma500/psb_drv.c index 111e3df9c5de..bddea5807442 100644 --- a/trunk/drivers/gpu/drm/gma500/psb_drv.c +++ b/trunk/drivers/gpu/drm/gma500/psb_drv.c @@ -601,6 +601,9 @@ static void psb_remove(struct pci_dev *pdev) static const struct dev_pm_ops psb_pm_ops = { .resume = gma_power_resume, .suspend = gma_power_suspend, + .thaw = gma_power_thaw, + .freeze = gma_power_freeze, + .restore = gma_power_restore, .runtime_suspend = psb_runtime_suspend, .runtime_resume = psb_runtime_resume, .runtime_idle = psb_runtime_idle,