video: da8xx-fb: fb_check_var enhancement

Check whether "struct fb_var_screeninfo" fields are sane, if not
update it to be within allowed limits.

If user sends down buggy "var" values, this will bring those within
allowable limits. And fb_set_par is not supposed to change "var"
values, fb_check_var has to ensure that values are proper.

Signed-off-by: Afzal Mohammed <afzal@ti.com>
Signed-off-by: Darren Etheridge <detheridge@ti.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>

diff --git a/drivers/video/da8xx-fb.c b/drivers/video/da8xx-fb.c
index 0810939936f4137037bbdc975967111b5b4cc9ca..d00dd173e3af8c9c4d5843db36375917f68de771 100644 (file)
--- a/drivers/video/da8xx-fb.c
+++ b/drivers/video/da8xx-fb.c
@@ -888,6 +888,9 @@ static int fb_check_var(struct fb_var_screeninfo *var,
                        struct fb_info *info)
 {
        int err = 0;
+       struct da8xx_fb_par *par = info->par;
+       int bpp = var->bits_per_pixel >> 3;
+       unsigned long line_size = var->xres_virtual * bpp;
 
        if (var->bits_per_pixel > 16 && lcd_revision == LCD_VERSION_1)
                return -EINVAL;
@@ -955,6 +958,21 @@ static int fb_check_var(struct fb_var_screeninfo *var,
        var->green.msb_right = 0;
        var->blue.msb_right = 0;
        var->transp.msb_right = 0;
+
+       if (line_size * var->yres_virtual > par->vram_size)
+               var->yres_virtual = par->vram_size / line_size;
+
+       if (var->yres > var->yres_virtual)
+               var->yres = var->yres_virtual;
+
+       if (var->xres > var->xres_virtual)
+               var->xres = var->xres_virtual;
+
+       if (var->xres + var->xoffset > var->xres_virtual)
+               var->xoffset = var->xres_virtual - var->xres;
+       if (var->yres + var->yoffset > var->yres_virtual)
+               var->yoffset = var->yres_virtual - var->yres;
+
        return err;
 }