summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2012-01-03 12:09:15 +1100
committerWilly Tarreau <w@1wt.eu>2012-02-11 15:38:18 +0100
commitffee6c2e0c3447fee202bb28d78f9c1dae289926 (patch)
tree27d67439e53b0251b5fce4a3f95860db252efaa0
parentc377a00dfca53f9a01c450829863535618e592bf (diff)
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> Signed-off-by: Willy Tarreau <w@1wt.eu>
-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 101de8c1c0ea..f6b25b7dfcee 100644
--- a/drivers/video/offb.c
+++ b/drivers/video/offb.c
@@ -368,7 +368,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;