summaryrefslogtreecommitdiffstats
path: root/drivers/staging/gma500/psb_intel_display.c
diff options
context:
space:
mode:
authorAlan Cox <alan@linux.intel.com>2011-08-26 11:20:17 +0100
committerGreg Kroah-Hartman <gregkh@suse.de>2011-08-26 10:46:44 -0700
commitcf9f1155592091687b02e64a40c41d6a482985cd (patch)
treed75ded175cae04419e7ea8e91a3b8ef56aba8cbe /drivers/staging/gma500/psb_intel_display.c
parent2a30cda7af24dc179d60f6343f065d6077f541f3 (diff)
downloadop-kernel-dev-cf9f1155592091687b02e64a40c41d6a482985cd.zip
op-kernel-dev-cf9f1155592091687b02e64a40c41d6a482985cd.tar.gz
gma500: Fix up suspend/resume
This isn't ideal as we could do with deferring the power on a lot more on Oaktrail and Medfield. We can't however do that without fixing other things first. Signed-off-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/gma500/psb_intel_display.c')
-rw-r--r--drivers/staging/gma500/psb_intel_display.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/staging/gma500/psb_intel_display.c b/drivers/staging/gma500/psb_intel_display.c
index 4afa671..caa9d86 100644
--- a/drivers/staging/gma500/psb_intel_display.c
+++ b/drivers/staging/gma500/psb_intel_display.c
@@ -1102,10 +1102,6 @@ static int psb_crtc_set_config(struct drm_mode_set *set)
{
int ret;
struct drm_device *dev = set->crtc->dev;
- struct drm_psb_private *dev_priv = dev->dev_private;
-
- if (!dev_priv->rpm_enabled)
- return drm_crtc_helper_set_config(set);
pm_runtime_forbid(&dev->pdev->dev);
ret = drm_crtc_helper_set_config(set);
OpenPOWER on IntegriCloud