diff options
| author | Geert Uytterhoeven | 2011-05-21 21:42:54 +0200 |
|---|---|---|
| committer | Paul Mundt | 2011-05-24 09:26:22 +0200 |
| commit | e3e4e9c61eb7bbd1171a2b948f1ea4591bac8289 (patch) | |
| tree | a5049240909c3397c7fdae606c131db543ff684d /drivers/video | |
| parent | video: mb862xxfb: Require either FB_MB862XX_PCI_GDC or FB_MB862XX_LIME (diff) | |
| download | kernel-qcow2-linux-e3e4e9c61eb7bbd1171a2b948f1ea4591bac8289.tar.gz kernel-qcow2-linux-e3e4e9c61eb7bbd1171a2b948f1ea4591bac8289.tar.xz kernel-qcow2-linux-e3e4e9c61eb7bbd1171a2b948f1ea4591bac8289.zip | |
fbdev/amifb: Correct check for video memory size
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>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'drivers/video')
| -rw-r--r-- | drivers/video/amifb.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/amifb.c b/drivers/video/amifb.c index e5d6b56d4447..603f84fae6a1 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; |