| Message ID | 1306006976-32117-1-git-send-email-geert@linux-m68k.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | e3e4e9c61eb7bbd1171a2b948f1ea4591bac8289 |
| Headers | show |
On Sat, May 21, 2011 at 09:42:54PM +0200, Geert Uytterhoeven wrote: > The check should compare the available memory size with the highest allocation > value (VIDEOMEMSIZE_*_2M), not with the lowest value (VIDEOMEMSIZE_*_1M). > > Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> On Sat, May 21, 2011 at 09:42:55PM +0200, Geert Uytterhoeven wrote: > Fail gracefully instead. > > Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> On Sat, May 21, 2011 at 09:42:56PM +0200, Geert Uytterhoeven wrote: > amiga_chip_alloc() already aligns to the PAGE_SIZE > > Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> All applied, thanks. -- To unsubscribe from this list: send the line "unsubscribe linux-fbdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/video/amifb.c b/drivers/video/amifb.c index e5d6b56..603f84f 100644 --- a/drivers/video/amifb.c +++ b/drivers/video/amifb.c @@ -2295,7 +2295,7 @@ default_chipset: defmode = amiga_vblank == 50 ? DEFMODE_PAL : DEFMODE_NTSC; if (amiga_chip_avail()-CHIPRAM_SAFETY_LIMIT > - VIDEOMEMSIZE_ECS_1M) + VIDEOMEMSIZE_ECS_2M) fb_info.fix.smem_len = VIDEOMEMSIZE_ECS_2M; else fb_info.fix.smem_len = VIDEOMEMSIZE_ECS_1M; @@ -2312,7 +2312,7 @@ default_chipset: maxfmode = TAG_FMODE_4; defmode = DEFMODE_AGA; if (amiga_chip_avail()-CHIPRAM_SAFETY_LIMIT > - VIDEOMEMSIZE_AGA_1M) + VIDEOMEMSIZE_AGA_2M) fb_info.fix.smem_len = VIDEOMEMSIZE_AGA_2M; else fb_info.fix.smem_len = VIDEOMEMSIZE_AGA_1M;
The check should compare the available memory size with the highest allocation value (VIDEOMEMSIZE_*_2M), not with the lowest value (VIDEOMEMSIZE_*_1M). Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> --- drivers/video/amifb.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)