Patchwork [RFCv2] vga: VBE: report maximum VGA_MEM_SIZE memory

login
register
mail settings
Submitter Alon Levy
Date May 25, 2011, 3:56 p.m.
Message ID <1306338965-6119-1-git-send-email-alevy@redhat.com>
Download mbox | patch
Permalink /patch/97372/
State New
Headers show

Comments

Alon Levy - May 25, 2011, 3:56 p.m.
When using -vga qxl the amount reported is minimally 32 MiB, making windows
guests come up in a 16 color mode. With this change they work correctly, coming
up with the full range of VBE supported modes.

This patch changes just the reported memory size by VBE
(VBE_DISPI_INDEX_VIDEO_MEMORY_64K) and not the actual vram_size like my
previous try.
---
 hw/vga.c |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)
Gerd Hoffmann - May 26, 2011, 7:46 a.m.
On 05/25/11 17:56, Alon Levy wrote:
> When using -vga qxl the amount reported is minimally 32 MiB, making windows
> guests come up in a 16 color mode. With this change they work correctly, coming
> up with the full range of VBE supported modes.
>
> This patch changes just the reported memory size by VBE
> (VBE_DISPI_INDEX_VIDEO_MEMORY_64K) and not the actual vram_size like my
> previous try.

Patch looks fine, nevertheless I'd like to root-cause this first, even 
if this is only for a better changelog entry.

cheers,
   Gerd

Patch

diff --git a/hw/vga.c b/hw/vga.c
index 124295a..07048bc 100644
--- a/hw/vga.c
+++ b/hw/vga.c
@@ -545,7 +545,14 @@  static uint32_t vbe_ioport_read_data(void *opaque, uint32_t addr)
             val = s->vbe_regs[s->vbe_index];
         }
     } else if (s->vbe_index == VBE_DISPI_INDEX_VIDEO_MEMORY_64K) {
-        val = s->vram_size / (64 * 1024);
+       /*
+        * windows xp guests don't like larger then VGA_RAM_SIZE (8 MiB),
+        * wrongly setting the display to 4 bit color depth. This fix doesn't
+        * affect native mode, where we have modes that require larger amounts
+        * of ram. (The maximum that VBE reports is 1600x1200 32 bit color depth
+        * which fits)
+        */
+        val = MIN(VGA_RAM_SIZE, s->vram_size) / (64 * 1024);
     } else {
         val = 0;
     }