qxl: define qxl operating on 4k pages
PATCH 1/4 qxl: define qxl operating on 4k pages
Signed-off-by Gerd Hoffmann <[email protected]>
--- hw/display/qxl.c | 5 +++-- hw/display/qxl.h | 3 +++ 2 files changed, 6 insertions(+), 2 deletions(-)
hw/display/qxl.c +3 -2
@@ -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; }
hw/display/qxl.h +3 -0
@@ -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;
Signature · 1 line
1.8.3.1
PATCH 2/4 qxl: simplify qxl_rom_size
Nowdays rom size is fixed at 8192 for live migration compat reasons. So we can ditch the pointless math trying to calculate the size needed. Also make the size sanity check fail at compile time not runtime.
Signed-off-by Gerd Hoffmann <[email protected]>
--- hw/display/qxl.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
hw/display/qxl.c +1 -3
@@ -313,9 +313,7 @@ static ram_addr_t qxl_rom_size(void)sizeof (qxl_modes);uint32_t rom_size =8192 ;/* two pages */ - required_rom_size =MAX (required_rom_size,TARGET_PAGE_SIZE ); - required_rom_size =msb_mask (required_rom_size *2 -1 ); -assert (required_rom_size <= rom_size); +QEMU_BUILD_BUG_ON (required_rom_size > rom_size);return rom_size; }
Signature · 1 line
1.8.3.1
PATCH 3/4 qxl: simplify page dirtying
In reply to Gerd HoffmannNo need to do target page size calculations here,memory_region_set_dirty will care for us.
Signed-off-by Gerd Hoffmann <[email protected]>
--- hw/display/qxl.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
hw/display/qxl.c +1 -2
@@ -414,9 +414,8 @@ static void qxl_ram_set_dirty(PCIQXLDevice *qxl, void *ptr)intptr_t offset; offset = ptr - base; - offset &= ~(TARGET_PAGE_SIZE -1 );assert (offset < qxl->vga.vram_size); -qxl_set_dirty (&qxl->vga.vram, offset, offset +TARGET_PAGE_SIZE ); +qxl_set_dirty (&qxl->vga.vram, offset, offset +3 ); }/* can be called from spice server thread context */
Signature · 1 line
1.8.3.1
PATCH 4/4 qxl: compile only once
In reply to Gerd HoffmannSigned-off-by Gerd Hoffmann <[email protected]>
--- hw/display/Makefile.objs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
hw/display/Makefile.objs +1 -2
@@ -31,5 +31,4 @@ obj-$(CONFIG_TCX) += tcx.o obj-$(CONFIG_VGA) += vga.o -common-obj-$(CONFIG_QXL) += qxl-logger.o qxl-render.o -obj-$(CONFIG_QXL) += qxl.o +common-obj-$(CONFIG_QXL) += qxl.o qxl-logger.o qxl-render.o
Signature · 1 line
1.8.3.1