diff options
| author | Shashank Sharma <shashanks@nvidia.com> | 2012-04-27 16:54:04 +0530 |
|---|---|---|
| committer | Rohan Somvanshi <rsomvanshi@nvidia.com> | 2012-05-02 06:02:05 -0700 |
| commit | 2b4ccbfaaaeefcb89cc07504527a034d0f9140eb (patch) | |
| tree | 891c3fcd5b490419cdc8813e80627d884da33eaa | |
| parent | f0a2ff2afda84c19f977dadf5701c7c354817e66 (diff) | |
video: tegra: fb: Enable window state while pan
Set window enabled flag in pan display. This fixes a blank
window display while switching console from dc_ext device to
framebuffer device, and allows dc_ext and fbdev to co-exist.
Removed previous work around to unblank fb from
tegra_dc_blank function.
Bug: 970263
Bug: 963480
Change-Id: I9853da211f78815246965d240d1717345c5ab391
Signed-off-by: Shashank Sharma <shashanks@nvidia.com>
Reviewed-on: http://git-master/r/99422
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Jon Mayo <jmayo@nvidia.com>
Reviewed-by: Kiran Adduri <kadduri@nvidia.com>
Reviewed-by: Allen Martin <amartin@nvidia.com>
| -rw-r--r-- | drivers/video/tegra/fb.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/drivers/video/tegra/fb.c b/drivers/video/tegra/fb.c index 0272b7f68f04..32ae6527c640 100644 --- a/drivers/video/tegra/fb.c +++ b/drivers/video/tegra/fb.c @@ -283,16 +283,6 @@ static int tegra_fb_blank(int blank, struct fb_info *info) dev_dbg(&tegra_fb->ndev->dev, "unblank\n"); tegra_fb->win->flags = TEGRA_WIN_FLAG_ENABLED; tegra_dc_enable(tegra_fb->win->dc); -#if defined(CONFIG_FRAMEBUFFER_CONSOLE) - /* - * TODO: - * This is a work around to provide an unblanking flip - * to dc driver, required to display fb-console after - * a blank event,and needs to be replaced by a proper - * unblanking mechanism - */ - tegra_fb_flip_win(tegra_fb); -#endif return 0; case FB_BLANK_NORMAL: @@ -331,7 +321,8 @@ static int tegra_fb_pan_display(struct fb_var_screeninfo *var, (var->xoffset * (var->bits_per_pixel/8)); tegra_fb->win->phys_addr = addr; - /* TODO: update virt_addr */ + tegra_fb->win->flags = TEGRA_WIN_FLAG_ENABLED; + tegra_fb->win->virt_addr = info->screen_base; tegra_dc_update_windows(&tegra_fb->win, 1); tegra_dc_sync_windows(&tegra_fb->win, 1); |