From e7ee11ad729ae8cd59241e52fd4bc3e2f90b7918 Mon Sep 17 00:00:00 2001 From: Frediano Ziglio Date: Mon, 7 May 2012 13:38:57 +0100 Subject: vgabios: Check if mode is currently supported as vesa specifications Vesa specification require that mode information return if a given mode is supported or not so test if we can support it checking required memory and set correctly supported bit. Signed-off-by: Frediano Ziglio Committed-by: Keir Fraser --- tools/firmware/vgabios/vbe.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'tools/firmware') diff --git a/tools/firmware/vgabios/vbe.c b/tools/firmware/vgabios/vbe.c index 15f44a8491..9625112573 100644 --- a/tools/firmware/vgabios/vbe.c +++ b/tools/firmware/vgabios/vbe.c @@ -928,10 +928,22 @@ Bit16u *AX;Bit16u CX; Bit16u ES;Bit16u DI; if (cur_info != 0) { + Bit16u max_bpp = dispi_get_max_bpp(); + Bit16u size_64k; + Bit16u totalMemory; + + outw(VBE_DISPI_IOPORT_INDEX, VBE_DISPI_INDEX_VIDEO_MEMORY_64K); + totalMemory = inw(VBE_DISPI_IOPORT_DATA); #ifdef DEBUG printf("VBE found mode %x\n",CX); #endif memcpyb(ss, &info, 0xc000, &(cur_info->info), sizeof(ModeInfoBlockCompact)); + size_64k = size64(info.XResolution, info.YResolution, info.BitsPerPixel); + if ((info.XResolution > dispi_get_max_xres()) || + (info.BitsPerPixel > max_bpp) || + (size_64k > totalMemory)) + info.ModeAttributes &= ~VBE_MODE_ATTRIBUTE_SUPPORTED; + if (using_lfb) { info.NumberOfBanks = 1; } -- cgit v1.2.3