qemu-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-devel] [PATCH 3/4 v4] vmware_vga: Return a value for FB_SIZE befor


From: BALATON Zoltan
Subject: [Qemu-devel] [PATCH 3/4 v4] vmware_vga: Return a value for FB_SIZE before the device is enabled
Date: Wed, 31 Oct 2012 02:09:30 +0100 (CET)
User-agent: Alpine 2.00 (GSO 1167 2008-08-23)

According to the documentation drivers using this device should read
FB_SIZE before enabling the device to know what memory to map. This
would not work if we return 0 before enabled. The docs also mention
reading SVGA_REG_DEPTH but not writing it. (Only SVGA_REG_BITS_PER_PIXEL
can be written but we don't really support that either.)

Signed-off-by: BALATON Zoltan <address@hidden>
---
 hw/vmware_vga.c |   19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

 v4: rebased to apply to current

diff --git a/hw/vmware_vga.c b/hw/vmware_vga.c
index 1aa6180..deb9dda 100644
--- a/hw/vmware_vga.c
+++ b/hw/vmware_vga.c
@@ -31,13 +31,14 @@
 #define HW_FILL_ACCEL
 #define HW_MOUSE_ACCEL

-# include "vga_int.h"
+#include "vga_int.h"
+
+/* See http://vmware-svga.sf.net/ for some documentation on VMWare SVGA */

 struct vmsvga_state_s {
     VGACommonState vga;

     int invalidated;
-    int depth;
     int enable;
     int config;
     struct {
@@ -55,7 +56,6 @@ struct vmsvga_state_s {
     uint32_t guest;
     uint32_t svgaid;
     int syncing;
-    int fb_size;

     MemoryRegion fifo_ram;
     uint8_t *fifo_ptr;
@@ -758,10 +758,10 @@ static uint32_t vmsvga_value_read(void *opaque, uint32_t 
address)
         return 0x0;

     case SVGA_REG_VRAM_SIZE:
-        return s->vga.vram_size;
+        return s->vga.vram_size; /* No physical VRAM besides the framebuffer */

     case SVGA_REG_FB_SIZE:
-        return s->fb_size;
+        return s->vga.vram_size;

     case SVGA_REG_CAPABILITIES:
         caps = SVGA_CAP_NONE;
@@ -850,7 +850,6 @@ static void vmsvga_value_write(void *opaque, uint32_t 
address, uint32_t value)
         s->invalidated = 1;
         s->vga.invalidate(&s->vga);
         if (s->enable) {
-            s->fb_size = ((s->depth + 7) >> 3) * s->new_width * s->new_height;
             vga_dirty_log_stop(&s->vga);
         } else {
             vga_dirty_log_start(&s->vga);
@@ -875,10 +874,9 @@ static void vmsvga_value_write(void *opaque, uint32_t 
address, uint32_t value)
         }
         break;

-    case SVGA_REG_DEPTH:
     case SVGA_REG_BITS_PER_PIXEL:
         if (value != ds_get_bits_per_pixel(s->vga.ds)) {
-            printf("%s: Bad colour depth: %i bits\n", __func__, value);
+            printf("%s: Bad bits per pixel: %i bits\n", __func__, value);
             s->config = 0;
         }
         break;
@@ -941,6 +939,7 @@ static void vmsvga_value_write(void *opaque, uint32_t 
address, uint32_t value)
 #endif
         break;

+    case SVGA_REG_DEPTH:
     case SVGA_REG_MEM_REGS:
     case SVGA_REG_NUM_DISPLAYS:
     case SVGA_REG_PITCHLOCK:
@@ -1079,7 +1078,7 @@ static const VMStateDescription 
vmstate_vmware_vga_internal = {
     .minimum_version_id_old = 0,
     .post_load = vmsvga_post_load,
     .fields      = (VMStateField[]) {
-        VMSTATE_INT32_EQUAL(depth, struct vmsvga_state_s),
+        VMSTATE_UNUSED(4), /* was depth */
         VMSTATE_INT32(enable, struct vmsvga_state_s),
         VMSTATE_INT32(config, struct vmsvga_state_s),
         VMSTATE_INT32(cursor.id, struct vmsvga_state_s),
@@ -1094,7 +1093,7 @@ static const VMStateDescription 
vmstate_vmware_vga_internal = {
         VMSTATE_UINT32(guest, struct vmsvga_state_s),
         VMSTATE_UINT32(svgaid, struct vmsvga_state_s),
         VMSTATE_INT32(syncing, struct vmsvga_state_s),
-        VMSTATE_INT32(fb_size, struct vmsvga_state_s),
+        VMSTATE_UNUSED(4), /* was fb_size */
         VMSTATE_END_OF_LIST()
     }
 };
--
1.7.10





reply via email to

[Prev in Thread] Current Thread [Next in Thread]