diff options
| author | Heiko Stübner <heiko@sntech.de> | 2013-03-22 15:13:02 +0100 |
|---|---|---|
| committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2013-04-04 13:08:06 +0300 |
| commit | a1655100ddfa10829b7d3b055611f268a82e335a (patch) | |
| tree | b00af82e6d7670881b27e83ab47490ed9a7d25fc /drivers/video/auo_k190x.c | |
| parent | 07961ac7c0ee8b546658717034fe692fd12eefa9 (diff) | |
| download | linux-next-a1655100ddfa10829b7d3b055611f268a82e335a.tar.gz | |
AUO-K190x: Use correct line length
Previously all functions that used the line length used xres directly,
thus hardcoding a 8bits per pixel value.
This patch calculates the correct line length according to the actual
bits per pixel value and changes all line length users to use the
calculated line length value.
Signed-off-by: Heiko Stübner <heiko@sntech.de>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'drivers/video/auo_k190x.c')
| -rw-r--r-- | drivers/video/auo_k190x.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/drivers/video/auo_k190x.c b/drivers/video/auo_k190x.c index 53846cb534d4..bc0b6433eae6 100644 --- a/drivers/video/auo_k190x.c +++ b/drivers/video/auo_k190x.c @@ -224,8 +224,8 @@ static void auok190xfb_dpy_deferred_io(struct fb_info *info, { struct fb_deferred_io *fbdefio = info->fbdefio; struct auok190xfb_par *par = info->par; + u16 line_length = info->fix.line_length; u16 yres = info->var.yres; - u16 xres = info->var.xres; u16 y1 = 0, h = 0; int prev_index = -1; struct page *cur; @@ -254,7 +254,7 @@ static void auok190xfb_dpy_deferred_io(struct fb_info *info, } /* height increment is fixed per page */ - h_inc = DIV_ROUND_UP(PAGE_SIZE , xres); + h_inc = DIV_ROUND_UP(PAGE_SIZE , line_length); /* calculate number of pages from pixel height */ threshold = par->consecutive_threshold / h_inc; @@ -265,7 +265,7 @@ static void auok190xfb_dpy_deferred_io(struct fb_info *info, list_for_each_entry(cur, &fbdefio->pagelist, lru) { if (prev_index < 0) { /* just starting so assign first page */ - y1 = (cur->index << PAGE_SHIFT) / xres; + y1 = (cur->index << PAGE_SHIFT) / line_length; h = h_inc; } else if ((cur->index - prev_index) <= threshold) { /* page is within our threshold for single updates */ @@ -275,7 +275,7 @@ static void auok190xfb_dpy_deferred_io(struct fb_info *info, par->update_partial(par, y1, y1 + h); /* start over with our non consecutive page */ - y1 = (cur->index << PAGE_SHIFT) / xres; + y1 = (cur->index << PAGE_SHIFT) / line_length; h = h_inc; } prev_index = cur->index; @@ -896,13 +896,13 @@ int auok190x_common_probe(struct platform_device *pdev, info->var.yres = panel->w; info->var.xres_virtual = panel->h; info->var.yres_virtual = panel->w; - info->fix.line_length = panel->h; + info->fix.line_length = panel->h * info->var.bits_per_pixel / 8; } else { info->var.xres = panel->w; info->var.yres = panel->h; info->var.xres_virtual = panel->w; info->var.yres_virtual = panel->h; - info->fix.line_length = panel->w; + info->fix.line_length = panel->w * info->var.bits_per_pixel / 8; } par->resolution = board->resolution; @@ -910,7 +910,8 @@ int auok190x_common_probe(struct platform_device *pdev, /* videomemory handling */ - videomemorysize = roundup((panel->w * panel->h), PAGE_SIZE); + videomemorysize = roundup((panel->w * panel->h) * + info->var.bits_per_pixel / 8, PAGE_SIZE); videomemory = vmalloc(videomemorysize); if (!videomemory) { ret = -ENOMEM; |