From: Rajesh Poornachandran <[email protected]> Medfield/GFX/PM: Modified the interface for ospm_power_using_hw_begin. This will allow better handling of power management.
Signed-off-by: Rajesh Poornachandran <[email protected]> Signed-off-by: Hitesh K. Patel <[email protected]> --- drivers/staging/mrst/drv/psb_powermgmt.c | 3 ++- drivers/staging/mrst/drv/psb_powermgmt.h | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/staging/mrst/drv/psb_powermgmt.c b/drivers/staging/mrst/drv/psb_powermgmt.c index 9a849d5..4af853c 100644 --- a/drivers/staging/mrst/drv/psb_powermgmt.c +++ b/drivers/staging/mrst/drv/psb_powermgmt.c @@ -1903,7 +1903,7 @@ bool ospm_power_is_hw_on(int hw_islands) * power state transition and the caller will be expected to handle that * even if force_on is set to true. */ -bool ospm_power_using_hw_begin(int hw_island, bool force_on) +bool ospm_power_using_hw_begin(int hw_island, UHBUsage usage) { bool ret = true; bool island_is_off = false; @@ -1911,6 +1911,7 @@ bool ospm_power_using_hw_begin(int hw_island, bool force_on) bool locked = true; struct pci_dev *pdev = gpDrmDevice->pdev; IMG_UINT32 deviceID = 0; + bool force_on = usage ? true: false; /*quick path, not 100% race safe, but should be enough comapre to current other code in this file */ if (!force_on) { if (hw_island & (OSPM_ALL_ISLANDS & ~g_hw_power_status_mask)) diff --git a/drivers/staging/mrst/drv/psb_powermgmt.h b/drivers/staging/mrst/drv/psb_powermgmt.h index 4f0462c..bb2f230 100644 --- a/drivers/staging/mrst/drv/psb_powermgmt.h +++ b/drivers/staging/mrst/drv/psb_powermgmt.h @@ -47,7 +47,6 @@ typedef enum _UHBUsage { OSPM_UHB_ONLY_IF_ON = 0, OSPM_UHB_FORCE_POWER_ON, - OSPM_UHB_IGNORE_POWER_OFF, } UHBUsage; //extern int psb_check_msvdx_idle(struct drm_device *dev); @@ -70,7 +69,7 @@ int ospm_power_resume(struct pci_dev *pdev); * These are the functions the driver should use to wrap all hw access * (i.e. register reads and writes) */ -bool ospm_power_using_hw_begin(int hw_island, bool force_on); +bool ospm_power_using_hw_begin(int hw_island, UHBUsage usage); void ospm_power_using_hw_end(int hw_island); /* -- 1.7.1 _______________________________________________ MeeGo-kernel mailing list [email protected] http://lists.meego.com/listinfo/meego-kernel
