video: tegra: dc: dont restore windows in unblank
Rakesh Iyer [Mon, 15 Jul 2013 18:41:05 +0000 (11:41 -0700)]
During unblank, the original framebuffer should be the window 0.
This is broken so for the short term we will keep windows unchanged
on unblank.

Bug 1299586
Bug 1329807

Change-Id: Ib16d901b9bc77d6ec9075a054c0b5e5c5d52cb55
Signed-off-by: Rakesh Iyer <riyer@nvidia.com>
Reviewed-on: http://git-master/r/251523
Reviewed-by: Simone Willett <swillett@nvidia.com>
Tested-by: Simone Willett <swillett@nvidia.com>

drivers/video/tegra/fb.c

index 905f14d..510c4db 100644 (file)
@@ -301,7 +301,10 @@ static int tegra_fb_blank(int blank, struct fb_info *info)
        switch (blank) {
        case FB_BLANK_UNBLANK:
                dev_dbg(&tegra_fb->ndev->dev, "unblank\n");
+#if !defined(CONFIG_ANDROID)
+               /* Not restoring windows to avoid white screen on android */
                tegra_fb->win->flags = TEGRA_WIN_FLAG_ENABLED;
+#endif
                tegra_dc_enable(tegra_fb->win->dc);
                tegra_dc_update_windows(&tegra_fb->win, 1);
                tegra_dc_sync_windows(&tegra_fb->win, 1);