diff -r 95d77829216f tools/firmware/hvmloader/hvmloader.c --- a/tools/firmware/hvmloader/hvmloader.c Thu Jan 08 11:19:38 2009 +0000 +++ b/tools/firmware/hvmloader/hvmloader.c Fri Jan 09 11:44:47 2009 -0500 @@ -576,7 +576,7 @@ { int option_rom_sz = 0, vgabios_sz = 0, etherboot_sz = 0; int rombios_sz, smbios_sz; - uint32_t etherboot_phys_addr, option_rom_phys_addr, vga_ram = 0; + uint32_t etherboot_phys_addr, option_rom_phys_addr, vga_ram = 0, vram_size = 0; uint16_t xen_pfiob; printf("HVM Loader\n"); @@ -626,10 +626,13 @@ break; } + xen_pfiob = init_xen_platform_io_base(); + vram_size = inl(xen_pfiob + 8); + if ( virtual_vga != VGA_none ) { - vga_ram = e820_malloc(8 << 20, 4096); - printf("VGA RAM at %08x\n", vga_ram); + vga_ram = e820_malloc(vram_size, 4096); + printf("%d megs of VGA RAM at %08x\n", vram_size / ( 1024 * 1024 ) , vga_ram); } etherboot_phys_addr = VGABIOS_PHYSICAL_ADDRESS + vgabios_sz; @@ -648,6 +651,8 @@ init_vm86_tss(); + init_vm86_tss(); + cmos_write_memory_size(); printf("BIOS map:\n"); @@ -672,7 +677,6 @@ ROMBIOS_PHYSICAL_ADDRESS, ROMBIOS_PHYSICAL_ADDRESS + rombios_sz - 1); - xen_pfiob = init_xen_platform_io_base(); if ( xen_pfiob && vga_ram ) outl(xen_pfiob + 4, vga_ram); diff -r 95d77829216f tools/firmware/vgabios/vbe.c --- a/tools/firmware/vgabios/vbe.c Thu Jan 08 11:19:38 2009 +0000 +++ b/tools/firmware/vgabios/vbe.c Fri Jan 09 11:44:47 2009 -0500 @@ -38,8 +38,6 @@ #include "vbe.h" #include "vbetables.h" -#define VBE_TOTAL_VIDEO_MEMORY_DIV_64K (VBE_DISPI_TOTAL_VIDEO_MEMORY_MB*1024/64) - // The current OEM Software Revision of this VBE Bios #define VBE_OEM_SOFTWARE_REV 0x0002; @@ -821,7 +819,8 @@ vbe_info_block.VideoModePtr_Off= DI + 34; // VBE Total Memory (in 64b blocks) - vbe_info_block.TotalMemory = VBE_TOTAL_VIDEO_MEMORY_DIV_64K; + outw(VBE_DISPI_IOPORT_INDEX, VBE_DISPI_INDEX_VIDEO_MEMORY_64K); + vbe_info_block.TotalMemory = inw(VBE_DISPI_IOPORT_DATA); if (vbe2_info) { @@ -846,7 +845,8 @@ do { if ((cur_info->info.XResolution <= dispi_get_max_xres()) && - (cur_info->info.BitsPerPixel <= dispi_get_max_bpp())) { + (cur_info->info.BitsPerPixel <= dispi_get_max_bpp()) && + (cur_info->info.XResolution * cur_info->info.XResolution * cur_info->info.BitsPerPixel <= vbe_info_block.TotalMemory << 19 )) { #ifdef DEBUG printf("VBE found mode %x => %x\n", cur_info->mode,cur_mode); #endif @@ -855,7 +855,7 @@ cur_ptr+=2; } else { #ifdef DEBUG - printf("VBE mode %x (xres=%x / bpp=%02x) not supported by display\n", cur_info->mode,cur_info->info.XResolution,cur_info->info.BitsPerPixel); + printf("VBE mode %x (xres=%x / bpp=%02x) not supported \n", cur_info->mode,cur_info->info.XResolution,cur_info->info.BitsPerPixel); #endif } cur_info++; @@ -913,7 +913,13 @@ info.WinFuncPtr = 0xC0000000UL; *(Bit16u *)&(info.WinFuncPtr) = (Bit16u)(dispi_set_bank_farcall); } - + outw(VBE_DISPI_IOPORT_INDEX,VBE_DISPI_INDEX_LFB_ADDRESS_H); + info.PhysBasePtr = inw(VBE_DISPI_IOPORT_DATA); + info.PhysBasePtr = info.PhysBasePtr << 16; +#if 0 + outw(VBE_DISPI_IOPORT_INDEX,VBE_DISPI_INDEX_LFB_ADDRESS_L); + info.PhysBasePtr |= inw(VBE_DISPI_IOPORT_DATA); +#endif result = 0x4f; } else diff -r 95d77829216f tools/firmware/vgabios/vbe.h --- a/tools/firmware/vgabios/vbe.h Thu Jan 08 11:19:38 2009 +0000 +++ b/tools/firmware/vgabios/vbe.h Fri Jan 09 11:44:47 2009 -0500 @@ -275,39 +275,41 @@ // like 0xE0000000 - #define VBE_DISPI_BANK_ADDRESS 0xA0000 - #define VBE_DISPI_BANK_SIZE_KB 64 + #define VBE_DISPI_BANK_ADDRESS 0xA0000 + #define VBE_DISPI_BANK_SIZE_KB 64 - #define VBE_DISPI_MAX_XRES 1024 - #define VBE_DISPI_MAX_YRES 768 + #define VBE_DISPI_MAX_XRES 2560 + #define VBE_DISPI_MAX_YRES 1600 - #define VBE_DISPI_IOPORT_INDEX 0x01CE - #define VBE_DISPI_IOPORT_DATA 0x01CF + #define VBE_DISPI_IOPORT_INDEX 0x01CE + #define VBE_DISPI_IOPORT_DATA 0x01CF - #define VBE_DISPI_INDEX_ID 0x0 - #define VBE_DISPI_INDEX_XRES 0x1 - #define VBE_DISPI_INDEX_YRES 0x2 - #define VBE_DISPI_INDEX_BPP 0x3 - #define VBE_DISPI_INDEX_ENABLE 0x4 - #define VBE_DISPI_INDEX_BANK 0x5 - #define VBE_DISPI_INDEX_VIRT_WIDTH 0x6 - #define VBE_DISPI_INDEX_VIRT_HEIGHT 0x7 - #define VBE_DISPI_INDEX_X_OFFSET 0x8 - #define VBE_DISPI_INDEX_Y_OFFSET 0x9 - - #define VBE_DISPI_ID0 0xB0C0 - #define VBE_DISPI_ID1 0xB0C1 - #define VBE_DISPI_ID2 0xB0C2 - #define VBE_DISPI_ID3 0xB0C3 - #define VBE_DISPI_ID4 0xB0C4 - - #define VBE_DISPI_DISABLED 0x00 - #define VBE_DISPI_ENABLED 0x01 - #define VBE_DISPI_GETCAPS 0x02 - #define VBE_DISPI_8BIT_DAC 0x20 - #define VBE_DISPI_LFB_ENABLED 0x40 - #define VBE_DISPI_NOCLEARMEM 0x80 - - #define VBE_DISPI_LFB_PHYSICAL_ADDRESS 0xE0000000 + #define VBE_DISPI_INDEX_ID 0x0 + #define VBE_DISPI_INDEX_XRES 0x1 + #define VBE_DISPI_INDEX_YRES 0x2 + #define VBE_DISPI_INDEX_BPP 0x3 + #define VBE_DISPI_INDEX_ENABLE 0x4 + #define VBE_DISPI_INDEX_BANK 0x5 + #define VBE_DISPI_INDEX_VIRT_WIDTH 0x6 + #define VBE_DISPI_INDEX_VIRT_HEIGHT 0x7 + #define VBE_DISPI_INDEX_X_OFFSET 0x8 + #define VBE_DISPI_INDEX_Y_OFFSET 0x9 + #define VBE_DISPI_INDEX_VIDEO_MEMORY_64K 0xa + #define VBE_DISPI_INDEX_LFB_ADDRESS_H 0xb + #define VBE_DISPI_INDEX_LFB_ADDRESS_L 0xc + + #define VBE_DISPI_LFB_PHYSICAL_ADDRESS 0xE0000000 + #define VBE_DISPI_ID0 0xB0C0 + #define VBE_DISPI_ID1 0xB0C1 + #define VBE_DISPI_ID2 0xB0C2 + #define VBE_DISPI_ID3 0xB0C3 + #define VBE_DISPI_ID4 0xB0C4 + + #define VBE_DISPI_DISABLED 0x00 + #define VBE_DISPI_ENABLED 0x01 + #define VBE_DISPI_GETCAPS 0x02 + #define VBE_DISPI_8BIT_DAC 0x20 + #define VBE_DISPI_LFB_ENABLED 0x40 + #define VBE_DISPI_NOCLEARMEM 0x80 #endif diff -r 95d77829216f tools/firmware/vgabios/vbetables-gen.c --- a/tools/firmware/vgabios/vbetables-gen.c Thu Jan 08 11:19:38 2009 +0000 +++ b/tools/firmware/vgabios/vbetables-gen.c Fri Jan 09 11:44:47 2009 -0500 @@ -2,7 +2,7 @@ #include #include -#define VBE_DISPI_TOTAL_VIDEO_MEMORY_MB 8 +#define VBE_DISPI_TOTAL_VIDEO_MEMORY_MB 16 typedef struct { int width; @@ -42,19 +42,40 @@ { 1600, 1200, 24 , 0x11F}, /* BOCHS/PLE, 86 'own' mode numbers */ -{ 320, 200, 32 , 0x140}, -{ 640, 400, 32 , 0x141}, -{ 640, 480, 32 , 0x142}, -{ 800, 600, 32 , 0x143}, -{ 1024, 768, 32 , 0x144}, -{ 1280, 1024, 32 , 0x145}, -{ 320, 200, 8 , 0x146}, -{ 1600, 1200, 32 , 0x147}, -{ 1152, 864, 8 , 0x148}, +{ 320, 200, 32 , 0x140}, +{ 640, 400, 32 , 0x141}, +{ 640, 480, 32 , 0x142}, +{ 800, 600, 32 , 0x143}, +{ 1024, 768, 32 , 0x144}, +{ 1280, 1024, 32 , 0x145}, +{ 320, 200, 8 , 0x146}, +{ 1600, 1200, 32 , 0x147}, +{ 1152, 864, 8 , 0x148}, { 1152, 864, 15 , 0x149}, { 1152, 864, 16 , 0x14a}, { 1152, 864, 24 , 0x14b}, { 1152, 864, 32 , 0x14c}, +{ 1280, 800, 16 , 0x178}, +{ 1280, 800, 24 , 0x179}, +{ 1280, 800, 32 , 0x17a}, +{ 1280, 960, 16 , 0x17b}, +{ 1280, 960, 24 , 0x17c}, +{ 1280, 960, 32 , 0x17d}, +{ 1440, 900, 16 , 0x17e}, +{ 1440, 900, 24 , 0x17f}, +{ 1440, 900, 32 , 0x180}, +{ 1400, 1050, 16 , 0x181}, +{ 1400, 1050, 24 , 0x182}, +{ 1400, 1050, 32 , 0x183}, +{ 1680, 1050, 16 , 0x184}, +{ 1680, 1050, 24 , 0x185}, +{ 1680, 1050, 32 , 0x186}, +{ 1920, 1200, 16 , 0x187}, +{ 1920, 1200, 24 , 0x188}, +{ 1920, 1200, 32 , 0x189}, +{ 2560, 1600, 16 , 0x18a}, +{ 2560, 1600, 24 , 0x18b}, +{ 2560, 1600, 32 , 0x18c}, { 0, }, }; diff -r 95d77829216f tools/firmware/vgabios/vgabios.c --- a/tools/firmware/vgabios/vgabios.c Thu Jan 08 11:19:38 2009 +0000 +++ b/tools/firmware/vgabios/vgabios.c Fri Jan 09 11:44:47 2009 -0500 @@ -3811,9 +3811,9 @@ for (i=0; i> (4 * digit)) & 0x000f; if (nibble <= 9) - outb(0x0500, nibble + '0'); + outb(0xe9, nibble + '0'); else - outb(0x0500, (nibble - 10) + 'A'); + outb(0xe9, (nibble - 10) + 'A'); digit--; } in_format = 0; @@ -3823,7 +3823,7 @@ // } } else { - outb(0x0500, c); + outb(0xe9, c); } s ++; } diff -r 95d77829216f tools/python/xen/xend/XendConfig.py --- a/tools/python/xen/xend/XendConfig.py Thu Jan 08 11:19:38 2009 +0000 +++ b/tools/python/xen/xend/XendConfig.py Fri Jan 09 11:44:47 2009 -0500 @@ -149,6 +149,7 @@ 'opengl': int, 'soundhw': str, 'stdvga': int, + 'videoram': int, 'usb': int, 'usbdevice': str, 'hpet': int, diff -r 95d77829216f tools/python/xen/xend/image.py --- a/tools/python/xen/xend/image.py Thu Jan 08 11:19:38 2009 +0000 +++ b/tools/python/xen/xend/image.py Fri Jan 09 11:44:47 2009 -0500 @@ -265,6 +265,10 @@ ret.append('-nographic') return ret + vram = str(vmConfig['platform'].get('videoram',4)) + ret.append('-videoram') + ret.append(vram) + vnc_config = {} has_vnc = int(vmConfig['platform'].get('vnc', 0)) != 0 has_sdl = int(vmConfig['platform'].get('sdl', 0)) != 0 @@ -847,8 +851,7 @@ # buffer io page, buffer pio page and memmap info page extra_pages = 1024 + 5 mem_kb += extra_pages * page_kb - # Add 8 MiB overhead for QEMU's video RAM. - return mem_kb + 8192 + return mem_kb def getRequiredInitialReservation(self): return self.vm.getMemoryTarget() @@ -890,8 +893,7 @@ return rc def getRequiredAvailableMemory(self, mem_kb): - # Add 8 MiB overhead for QEMU's video RAM. - return mem_kb + 8192 + return mem_kb def getRequiredInitialReservation(self): return self.vm.getMemoryTarget() diff -r 95d77829216f tools/python/xen/xm/create.py --- a/tools/python/xen/xm/create.py Thu Jan 08 11:19:38 2009 +0000 +++ b/tools/python/xen/xm/create.py Fri Jan 09 11:44:47 2009 -0500 @@ -523,9 +523,9 @@ use="""Try to find an unused port for the VNC server. Only valid when vnc=1.""") -gopts.var('videoram', val='', - fn=set_value, default=None, - use="""Maximum amount of videoram PV guest can allocate +gopts.var('videoram', val='MEMORY', + fn=set_int, default=4, + use="""Maximum amount of videoram a guest can allocate for frame buffer.""") gopts.var('sdl', val='', @@ -862,7 +862,7 @@ """Create the config for HVM devices. """ args = [ 'device_model', 'pae', 'vcpus', 'boot', 'fda', 'fdb', 'timer_mode', - 'localtime', 'serial', 'stdvga', 'isa', 'nographic', 'soundhw', + 'localtime', 'serial', 'stdvga', 'videoram', 'isa', 'nographic', 'soundhw', 'vnc', 'vncdisplay', 'vncunused', 'vncconsole', 'vnclisten', 'sdl', 'display', 'xauthority', 'rtc_timeoffset', 'monitor', 'acpi', 'apic', 'usb', 'usbdevice', 'keymap', 'pci', 'hpet',