diff options
author | Alan Cox <alan@linux.intel.com> | 2012-03-14 08:00:09 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2012-03-15 05:46:02 -0400 |
commit | 50d44a523759c39af1119285a5396ca387288af0 (patch) | |
tree | 1b961292fe18468ce2edd380ad4036244a8cb158 /drivers/gpu | |
parent | f1377998eede7a8caa124fcf6a589b02c9e2bac7 (diff) |
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>
Diffstat (limited to 'drivers/gpu')
-rw-r--r-- | drivers/gpu/drm/gma500/power.c | 3 |
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) | |||
102 | struct drm_device *dev = pci_get_drvdata(pdev); | 102 | struct drm_device *dev = pci_get_drvdata(pdev); |
103 | struct drm_psb_private *dev_priv = dev->dev_private; | 103 | struct drm_psb_private *dev_priv = dev->dev_private; |
104 | 104 | ||
105 | if (dev_priv->suspended == false) | ||
106 | return; | ||
107 | |||
108 | /* turn on the display power island */ | 105 | /* turn on the display power island */ |
109 | dev_priv->ops->power_up(dev); | 106 | dev_priv->ops->power_up(dev); |
110 | dev_priv->suspended = false; | 107 | dev_priv->suspended = false; |