From 4fb2d9ce0a5adf38d08ecfd5913c21686c7529aa Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Mon, 17 Jan 2011 18:52:17 +0100 Subject: fb: When setting a mode, also update xres, yres and fb size Also, set size to 0 when setting up the framebuffer failed so that the user cannot write to uninitialized framebuffer memory. Signed-off-by: Sascha Hauer --- drivers/video/fb.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/drivers/video/fb.c b/drivers/video/fb.c index ba34b9c809..cf21c4bba3 100644 --- a/drivers/video/fb.c +++ b/drivers/video/fb.c @@ -77,12 +77,18 @@ static int fb_setup_mode(struct device_d *dev, struct param_d *param, info->mode = &info->mode_list[mode]; - ret = info->fbops->fb_activate_var(info); + info->xres = info->mode->xres; + info->yres = info->mode->yres; - dev->map_base = (unsigned long)info->screen_base; + ret = info->fbops->fb_activate_var(info); - if (ret == 0) + if (!ret) { + dev->map_base = (unsigned long)info->screen_base; + info->cdev.size = info->xres * info->yres * (info->bits_per_pixel >> 3); + dev->size = info->cdev.size; dev_param_set_generic(dev, param, val); + } else + info->cdev.size = 0; return ret; } -- cgit v1.2.3