From: Vincent Hanquez Date: Wed, 17 Dec 2008 17:32:01 +0000 (+0000) Subject: patch std_vga_vbe3 X-Git-Url: http://xenbits.xen.org/gitweb?a=commitdiff_plain;h=e50bc3cc203369ab66429e74152922dee4c8bc60;p=xenclient%2Fxen.git patch std_vga_vbe3 --- diff --git a/tools/firmware/hvmloader/hvmloader.c b/tools/firmware/hvmloader/hvmloader.c index 9dff7cc..7c15153 100644 --- a/tools/firmware/hvmloader/hvmloader.c +++ b/tools/firmware/hvmloader/hvmloader.c @@ -462,7 +462,7 @@ static uint16_t init_xen_platform_io_base(void) int main(void) { int vgabios_sz = 0, etherboot_sz = 0, rombios_sz, smbios_sz; - uint32_t vga_ram = 0; + uint32_t vga_ram = 0, vram_size = 0; uint16_t xen_pfiob; printf("HVM Loader\n"); @@ -510,10 +510,13 @@ int main(void) 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_sz = scan_etherboot_nic((void*)ETHERBOOT_PHYSICAL_ADDRESS); @@ -544,7 +547,6 @@ int main(void) 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 --git a/tools/firmware/vgabios/vbe.c b/tools/firmware/vgabios/vbe.c index 87f7414..3fc786d 100644 --- a/tools/firmware/vgabios/vbe.c +++ b/tools/firmware/vgabios/vbe.c @@ -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 @@ Bit16u *AX;Bit16u ES;Bit16u DI; 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 @@ Bit16u *AX;Bit16u ES;Bit16u DI; 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 @@ Bit16u *AX;Bit16u ES;Bit16u DI; 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 @@ Bit16u *AX;Bit16u CX; Bit16u ES;Bit16u DI; 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 --git a/tools/firmware/vgabios/vbe.h b/tools/firmware/vgabios/vbe.h index 60434ac..3b78582 100644 --- a/tools/firmware/vgabios/vbe.h +++ b/tools/firmware/vgabios/vbe.h @@ -275,39 +275,41 @@ typedef struct ModeInfoListItem // 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 --git a/tools/firmware/vgabios/vbetables-gen.c b/tools/firmware/vgabios/vbetables-gen.c index 7014a16..64f3f0d 100644 --- a/tools/firmware/vgabios/vbetables-gen.c +++ b/tools/firmware/vgabios/vbetables-gen.c @@ -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 @@ ModeInfo modes[] = { { 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 --git a/tools/firmware/vgabios/vgabios.c b/tools/firmware/vgabios/vgabios.c index 3fd9f2f..e32afd6 100644 --- a/tools/firmware/vgabios/vgabios.c +++ b/tools/firmware/vgabios/vgabios.c @@ -55,6 +55,7 @@ #endif #define USE_BX_INFO +#define DEBUG /* Declares */ static Bit8u read_byte(); @@ -3811,9 +3812,9 @@ void printf(s) 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 +3824,7 @@ void printf(s) // } } else { - outb(0x0500, c); + outb(0xe9, c); } s ++; } diff --git a/tools/python/xen/xend/XendConfig.py b/tools/python/xen/xend/XendConfig.py index 1566481..a4fc927 100644 --- a/tools/python/xen/xend/XendConfig.py +++ b/tools/python/xen/xend/XendConfig.py @@ -149,6 +149,7 @@ XENAPI_PLATFORM_CFG_TYPES = { 'opengl': int, 'soundhw': str, 'stdvga': int, + 'vram': int, 'usb': int, 'usbdevice': str, 'hpet': int, diff --git a/tools/python/xen/xend/image.py b/tools/python/xen/xend/image.py index 6b55a94..adadef0 100644 --- a/tools/python/xen/xend/image.py +++ b/tools/python/xen/xend/image.py @@ -265,6 +265,10 @@ class ImageHandler: ret.append('-nographic') return ret + vram = str(vmConfig['platform'].get('vram',8)) + 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 @@ -857,8 +861,7 @@ class IA64_HVM_ImageHandler(HVMImageHandler): # 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() @@ -900,8 +903,7 @@ class X86_HVM_ImageHandler(HVMImageHandler): 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 --git a/tools/python/xen/xm/create.py b/tools/python/xen/xm/create.py index f8a1edf..3582b89 100644 --- a/tools/python/xen/xm/create.py +++ b/tools/python/xen/xm/create.py @@ -185,6 +185,10 @@ gopts.var('memory', val='MEMORY', fn=set_int, default=128, use="Domain memory in MB.") +gopts.var('vram', val='MEMORY', + fn=set_int, default=8, + use="Video memory in MB.") + gopts.var('maxmem', val='MEMORY', fn=set_int, default=None, use="Maximum domain memory in MB.") @@ -864,7 +868,7 @@ def configure_hvm(config_image, vals): """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', 'vram', 'isa', 'nographic', 'soundhw', 'vnc', 'vncdisplay', 'vncunused', 'vncconsole', 'vnclisten', 'sdl', 'display', 'xauthority', 'rtc_timeoffset', 'monitor', 'acpi', 'apic', 'usb', 'usbdevice', 'keymap', 'pci', 'hpet',