shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-07 19:30:30 +09:00
Code Issues Packages Projects Releases Wiki Activity

rk fb: fix get fb info addr error if at fb0-win1 map when close fb

Browse Source
This commit is contained in:
zwl
2014-10-20 10:53:03 +08:00
parent 193c997f24
commit 07af23d4ff
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/video/rockchip/rk_fb.c
View File

@@ -776,7 +776,8 @@ static int rk_fb_close(struct fb_info *info, int user)
win = dev_drv->win[win_id];
fb_par->state--;
if (!fb_par->state) {
info->fix.smem_start = win->reserved;
if (fb_par->fb_phy_base > 0)
info->fix.smem_start = fb_par->fb_phy_base;
info->var.xres = dev_drv->screen0->mode.xres;
info->var.yres = dev_drv->screen0->mode.yres;
/*
@@ -3684,11 +3685,6 @@ static int rk_fb_alloc_buffer(struct fb_info *fbi, int fb_id)
fb_par->fb_phy_base = fbi->fix.smem_start;
fb_par->fb_virt_base = fbi->screen_base;
fb_par->fb_size = fbi->fix.smem_len;
win_id = dev_drv->ops->fb_get_win_id(dev_drv, fbi->fix.id);
if (win_id >= 0) {
win = dev_drv->win[win_id];
win->reserved = fbi->fix.smem_start;
}
return ret;
}