From fd1e7a9f675d89b288bf82b73df8807e3c640d90 Mon Sep 17 00:00:00 2001
From: Alan Cox <alan@linux.intel.com>
Date: Wed, 14 Mar 2012 12:00:09 +0000
Subject: [PATCH] --- yaml --- r: 293779 b: refs/heads/master c:
 50d44a523759c39af1119285a5396ca387288af0 h: refs/heads/master i:   293777:
 8a98e7acce60a2003bde01f83b942e79650ccd05   293775:
 4def6ff58abb4a3deaa21d920678deccce68eff0 v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/gpu/drm/gma500/power.c | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index a2dff6ff7671..f9974482fbbf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f1377998eede7a8caa124fcf6a589b02c9e2bac7
+refs/heads/master: 50d44a523759c39af1119285a5396ca387288af0
diff --git a/trunk/drivers/gpu/drm/gma500/power.c b/trunk/drivers/gpu/drm/gma500/power.c
index 994f66935499..8d23c45b5bc6 100644
--- a/trunk/drivers/gpu/drm/gma500/power.c
+++ b/trunk/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;