From: Ryan Zhou <[email protected]> Enable D0i3 power management state for MSVDX video device.
Signed-off-by: Ryan Zhou <[email protected]> Signed-off-by: Hitesh K. Patel <[email protected]> --- drivers/staging/mrst/drv/psb_drv.c | 4 ++-- drivers/staging/mrst/drv/psb_powermgmt.c | 3 --- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/drivers/staging/mrst/drv/psb_drv.c b/drivers/staging/mrst/drv/psb_drv.c index 86a4a3e..b496562 100644 --- a/drivers/staging/mrst/drv/psb_drv.c +++ b/drivers/staging/mrst/drv/psb_drv.c @@ -70,9 +70,9 @@ int drm_psb_disable_vsync = 1; int drm_psb_no_fb; int drm_psb_force_pipeb; int drm_idle_check_interval = 5; -int drm_msvdx_pmpolicy = PSB_PMPOLICY_POWERDOWN; +int drm_msvdx_pmpolicy = PSB_PMPOLICY_NOPM; int drm_msvdx_delay = 250; -int drm_topaz_pmpolicy = PSB_PMPOLICY_POWERDOWN; +int drm_topaz_pmpolicy = PSB_PMPOLICY_NOPM; int drm_topaz_sbuswa; int drm_psb_ospm = 1; int drm_psb_topaz_clockgating = 0; diff --git a/drivers/staging/mrst/drv/psb_powermgmt.c b/drivers/staging/mrst/drv/psb_powermgmt.c index 7cdccae..b6765db 100644 --- a/drivers/staging/mrst/drv/psb_powermgmt.c +++ b/drivers/staging/mrst/drv/psb_powermgmt.c @@ -299,9 +299,7 @@ out: #else void ospm_apm_power_down_msvdx(struct drm_device *dev) { - return; mutex_lock(&g_ospm_mutex); - printk(KERN_ALERT "enter %s\n", __func__); if (!ospm_power_is_hw_on(OSPM_VIDEO_DEC_ISLAND)) goto out; @@ -321,7 +319,6 @@ out: void ospm_apm_power_down_topaz(struct drm_device *dev) { - return; mutex_lock(&g_ospm_mutex); if (!ospm_power_is_hw_on(OSPM_VIDEO_ENC_ISLAND)) -- 1.7.1 _______________________________________________ MeeGo-kernel mailing list [email protected] http://lists.meego.com/listinfo/meego-kernel
