aboutsummaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2012-01-03 12:09:15 +1100
committerGreg Kroah-Hartman <gregkh@suse.de>2012-01-12 11:29:19 -0800
commit69236e6011d14450a3ed033327d1e6e225b35027 (patch)
tree5d261341f73b40f3e2d34fa54c125486b7a06a2a /drivers
parentdfedad611959d25331b77459bc9a96fb7765127f (diff)
downloadvexpress-lsk-69236e6011d14450a3ed033327d1e6e225b35027.tar.gz
offb: Fix bug in calculating requested vram size
commit c055fe0797b7bd8f6f21a13598a55a16d5c13ae7 upstream. We used to try to request 8 times more vram than needed, which would fail if the card has a too small BAR (observed with qemu & kvm). Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/video/offb.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/offb.c b/drivers/video/offb.c
index 24e1fc6b565..3251a0236d5 100644
--- a/drivers/video/offb.c
+++ b/drivers/video/offb.c
@@ -377,7 +377,7 @@ static void __init offb_init_fb(const char *name, const char *full_name,
int pitch, unsigned long address,
int foreign_endian, struct device_node *dp)
{
- unsigned long res_size = pitch * height * (depth + 7) / 8;
+ unsigned long res_size = pitch * height;
struct offb_par *par = &default_par;
unsigned long res_start = address;
struct fb_fix_screeninfo *fix;