From: Jani Nikula Date: Thu, 5 Jan 2012 13:35:36 +0000 (+0200) Subject: gfx: display: allow powering down GL3 cache regardless of GL3 config X-Git-Tag: 2.1b_release~377 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0200499b95de6d41195a3093efc8602c300e26b8;p=kernel%2Fkernel-mfld-blackbay.git gfx: display: allow powering down GL3 cache regardless of GL3 config The commit "psb_video: remove OSPM_GL3_CACHE_ISLAND when not enabled" made it impossible to power down the GL3 cache island when CONFIG_MDFD_GL3=n. It's powered on at boot (likely by firmware) so allow powering down regardless of config. This fixes the following situation in /sys/kernel/debug/mid_pmu_states when display is off: pci 8086 0130 0000:00:02.0 pvrsrvkm: |-------> GFX D0i3 |-------> Video Decoder D0i3 |-------> Video Encoder D0i3 |-------> GL3 Cache D0 |-------> Display A D0i3 |-------> Display B D0i3 |-------> Display C D0i3 |-------> MIPI-DSI D0i3 Signed-off-by: Jani Nikula Acked-by: Pauli Nieminen Signed-off-by: Kirill A. Shutemov --- diff --git a/drivers/staging/mrst/drv/psb_powermgmt.c b/drivers/staging/mrst/drv/psb_powermgmt.c index 319cefa..9975779 100644 --- a/drivers/staging/mrst/drv/psb_powermgmt.c +++ b/drivers/staging/mrst/drv/psb_powermgmt.c @@ -1464,10 +1464,6 @@ 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) {