diff options
| author | Gerd Hoffmann <kraxel@redhat.com> | 2013-09-11 13:14:25 +0200 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2013-09-18 11:13:29 +0200 |
| commit | 9efc2d8d813b94fde0a2bad6c13850bef7636748 (patch) | |
| tree | 7e7dc1908111f046af7b2cb21ddb96be42e56949 /hw/display | |
| parent | 6c2679fc19560699679200fb42ab4659bcbe7f79 (diff) | |
| download | focaccia-qemu-9efc2d8d813b94fde0a2bad6c13850bef7636748.tar.gz focaccia-qemu-9efc2d8d813b94fde0a2bad6c13850bef7636748.zip | |
qxl: define qxl operating on 4k pages
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Diffstat (limited to 'hw/display')
| -rw-r--r-- | hw/display/qxl.c | 5 | ||||
| -rw-r--r-- | hw/display/qxl.h | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/hw/display/qxl.c b/hw/display/qxl.c index c50e285e21..f0bfd2cdf7 100644 --- a/hw/display/qxl.c +++ b/hw/display/qxl.c @@ -364,7 +364,7 @@ static void init_qxl_rom(PCIQXLDevice *d) num_pages = d->vga.vram_size; num_pages -= ram_header_size; num_pages -= surface0_area_size; - num_pages = num_pages / TARGET_PAGE_SIZE; + num_pages = num_pages / QXL_PAGE_SIZE; rom->draw_area_offset = cpu_to_le32(0); rom->surface0_area_size = cpu_to_le32(surface0_area_size); @@ -528,7 +528,8 @@ static void interface_get_init_info(QXLInstance *sin, QXLDevInitInfo *info) info->num_memslots = NUM_MEMSLOTS; info->num_memslots_groups = NUM_MEMSLOTS_GROUPS; info->internal_groupslot_id = 0; - info->qxl_ram_size = le32_to_cpu(qxl->shadow_rom.num_pages) << TARGET_PAGE_BITS; + info->qxl_ram_size = + le32_to_cpu(qxl->shadow_rom.num_pages) << QXL_PAGE_BITS; info->n_surfaces = qxl->ssd.num_surfaces; } diff --git a/hw/display/qxl.h b/hw/display/qxl.h index 8e9b0c299e..84f0182383 100644 --- a/hw/display/qxl.h +++ b/hw/display/qxl.h @@ -27,6 +27,9 @@ enum qxl_mode { #define QXL_NUM_DIRTY_RECTS 64 +#define QXL_PAGE_BITS 12 +#define QXL_PAGE_SIZE (1 << QXL_PAGE_BITS); + typedef struct PCIQXLDevice { PCIDevice pci; SimpleSpiceDisplay ssd; |