diff options
| author | Alan Cox | 2011-04-01 19:42:08 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2011-04-05 20:36:30 +0200 |
| commit | c3460fd3ec3819c37aeb7bd68e4705ff87733872 (patch) | |
| tree | 3dd2ae4d1f8c62cafb29e9c4cd08c4065749c728 /drivers/staging/gma500/mrst_lvds.c | |
| parent | staging: gma500: prune more unused fields (diff) | |
| download | kernel-qcow2-linux-c3460fd3ec3819c37aeb7bd68e4705ff87733872.tar.gz kernel-qcow2-linux-c3460fd3ec3819c37aeb7bd68e4705ff87733872.tar.xz kernel-qcow2-linux-c3460fd3ec3819c37aeb7bd68e4705ff87733872.zip | |
staging: gma500: begin tidying up the power management
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/gma500/mrst_lvds.c')
| -rw-r--r-- | drivers/staging/gma500/mrst_lvds.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/staging/gma500/mrst_lvds.c b/drivers/staging/gma500/mrst_lvds.c index 4628b01694a9..21b9056ec84a 100644 --- a/drivers/staging/gma500/mrst_lvds.c +++ b/drivers/staging/gma500/mrst_lvds.c @@ -48,8 +48,7 @@ static void mrst_lvds_set_power(struct drm_device *dev, DRM_DRIVER_PRIVATE_T *dev_priv = dev->dev_private; PSB_DEBUG_ENTRY("\n"); - if (!ospm_power_using_hw_begin(OSPM_DISPLAY_ISLAND, - OSPM_UHB_FORCE_POWER_ON)) + if (!gma_power_begin(dev, true)) return; if (on) { @@ -69,7 +68,7 @@ static void mrst_lvds_set_power(struct drm_device *dev, pm_request_idle(&dev->pdev->dev); } - ospm_power_using_hw_end(OSPM_DISPLAY_ISLAND); + gma_power_end(dev); } static void mrst_lvds_dpms(struct drm_encoder *encoder, int mode) @@ -99,8 +98,7 @@ static void mrst_lvds_mode_set(struct drm_encoder *encoder, PSB_DEBUG_ENTRY("\n"); - if (!ospm_power_using_hw_begin(OSPM_DISPLAY_ISLAND, - OSPM_UHB_FORCE_POWER_ON)) + if (!gma_power_begin(dev, true)) return; /* @@ -144,7 +142,7 @@ static void mrst_lvds_mode_set(struct drm_encoder *encoder, } else /*(v == DRM_MODE_SCALE_FULLSCREEN)*/ REG_WRITE(PFIT_CONTROL, PFIT_ENABLE); - ospm_power_using_hw_end(OSPM_DISPLAY_ISLAND); + gma_power_end(dev); } |