summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlan Cox <alan@linux.intel.com>2012-03-14 13:00:09 +0100
committerDave Airlie <airlied@redhat.com>2012-03-15 10:46:02 +0100
commit50d44a523759c39af1119285a5396ca387288af0 (patch)
tree1b961292fe18468ce2edd380ad4036244a8cb158
parentdrm/nouveau: add userspace fallback hints. (diff)
downloadlinux-50d44a523759c39af1119285a5396ca387288af0.tar.xz
linux-50d44a523759c39af1119285a5396ca387288af0.zip
gma500: Fix resume paths
We fall apart somewhat on resume because we don't invoke all the resume methods as we should. Fix the silly error in the logic. Signed-off-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
-rw-r--r--drivers/gpu/drm/gma500/power.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/gpu/drm/gma500/power.c b/drivers/gpu/drm/gma500/power.c
index 994f66935499..8d23c45b5bc6 100644
--- a/drivers/gpu/drm/gma500/power.c
+++ b/drivers/gpu/drm/gma500/power.c
@@ -102,9 +102,6 @@ static void gma_resume_display(struct pci_dev *pdev)
struct drm_device *dev = pci_get_drvdata(pdev);
struct drm_psb_private *dev_priv = dev->dev_private;
- if (dev_priv->suspended == false)
- return;
-
/* turn on the display power island */
dev_priv->ops->power_up(dev);
dev_priv->suspended = false;