summaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/gma500/power.c
diff options
context:
space:
mode:
authorAlan Cox <alan@linux.intel.com>2012-03-14 16:00:29 +0400
committerDave Airlie <airlied@redhat.com>2012-03-15 13:46:22 +0400
commit09016a11fc738e82ca1303e2332473b517bbd660 (patch)
treee347502a2cec3008c8a17269f9bee34c9509be1c /drivers/gpu/drm/gma500/power.c
parent50d44a523759c39af1119285a5396ca387288af0 (diff)
downloadlinux-09016a11fc738e82ca1303e2332473b517bbd660.tar.xz
gma500: suspend/resume support for Cedartrail
Update our tree to match the current driver head. Signed-off-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/gma500/power.c')
-rw-r--r--drivers/gpu/drm/gma500/power.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/gma500/power.c b/drivers/gpu/drm/gma500/power.c
index 8d23c45b5bc6..889b854751da 100644
--- a/drivers/gpu/drm/gma500/power.c
+++ b/drivers/gpu/drm/gma500/power.c
@@ -193,6 +193,7 @@ int gma_power_suspend(struct device *_dev)
if (!dev_priv->suspended) {
if (dev_priv->display_count) {
mutex_unlock(&power_mutex);
+ dev_err(dev->dev, "GPU hardware busy, cannot suspend\n");
return -EBUSY;
}
psb_irq_uninstall(dev);
@@ -300,7 +301,7 @@ int psb_runtime_suspend(struct device *dev)
int psb_runtime_resume(struct device *dev)
{
- return gma_power_resume(dev);;
+ return gma_power_resume(dev);
}
int psb_runtime_idle(struct device *dev)