psb_video: remove OSPM_GL3_CACHE_ISLAND when not enabled

When setting the island up for OSPM_GL3_CACHE_ISLAND the code was not
protected when the config is not enabled

Signed-off-by: Daniel Charles <daniel.charles@intel.com>
Reviewed-by: Pauli Nieminen <pauli.nieminen@linux.intel.com>
Reviewed-by: Sean V Kelley <sean.v.kelley@intel.com>
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>

diff --git a/drivers/staging/mrst/drv/psb_powermgmt.c b/drivers/staging/mrst/drv/psb_powermgmt.c
index 4dc44f0..e0cf296 100644 (file)
--- a/drivers/staging/mrst/drv/psb_powermgmt.c
+++ b/drivers/staging/mrst/drv/psb_powermgmt.c
@@ -1326,6 +1326,9 @@ void ospm_power_island_up(int hw_islands)
        u32 cnt = 0;
        unsigned long flags;
 
+#ifndef CONFIG_MDFD_GL3
+       hw_islands &= ~OSPM_GL3_CACHE_ISLAND;
+#endif
        if (hw_islands & (OSPM_GRAPHICS_ISLAND | OSPM_VIDEO_ENC_ISLAND |
                                OSPM_VIDEO_DEC_ISLAND | OSPM_GL3_CACHE_ISLAND |
                                OSPM_ISP_ISLAND)) {
@@ -1462,6 +1465,10 @@ void ospm_power_island_down(int islands)
        u32 cnt = 0;
        unsigned long flags;
 
+#ifndef CONFIG_MDFD_GL3
+       islands &= ~OSPM_GL3_CACHE_ISLAND;
+#endif
+
        g_hw_power_status_mask &= ~islands;
 
        if (islands & OSPM_GRAPHICS_ISLAND) {