From cbf290599ad2cc429c418dee82b9c29eccbe810f Mon Sep 17 00:00:00 2001 From: Heiko Stuebner Date: Sun, 24 Jun 2012 17:11:35 +0200 Subject: [PATCH 4/9] AUO-K190x: make memory check in check_var more flexible Use only information from the new var to calculate the amount of memory needed. Signed-off-by: Heiko Stübner --- drivers/video/auo_k190x.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/drivers/video/auo_k190x.c b/drivers/video/auo_k190x.c index 954b781..9cd9b7e 100644 --- a/drivers/video/auo_k190x.c +++ b/drivers/video/auo_k190x.c @@ -375,6 +375,9 @@ static void auok190xfb_imageblit(struct fb_info *info, static int auok190xfb_check_var(struct fb_var_screeninfo *var, struct fb_info *info) { + struct device *dev = info->device; + int size; + if (info->var.xres != var->xres || info->var.yres != var->yres || info->var.xres_virtual != var->xres_virtual || info->var.yres_virtual != var->yres_virtual) { @@ -387,9 +390,10 @@ static int auok190xfb_check_var(struct fb_var_screeninfo *var, * Memory limit */ - if ((info->fix.line_length * var->yres_virtual) > info->fix.smem_len) { - pr_info("%s: Memory Limit requested yres_virtual = %u\n", - __func__, var->yres_virtual); + size = var->xres_virtual * var->yres_virtual * var->bits_per_pixel / 8; + if (size > info->fix.smem_len) { + dev_err(dev, "Memory limit exceeded, requested %dK\n", + size >> 10); return -ENOMEM; } -- 1.7.2.3