Revision 9f810beb hw/vmware_vga.c
| b/hw/vmware_vga.c | ||
|---|---|---|
| 622 | 622 |
cursor.bpp = vmsvga_fifo_read(s); |
| 623 | 623 |
|
| 624 | 624 |
args = SVGA_BITMAP_SIZE(x, y) + SVGA_PIXMAP_SIZE(x, y, cursor.bpp); |
| 625 |
if (SVGA_BITMAP_SIZE(x, y) > sizeof cursor.mask ||
|
|
| 626 |
SVGA_PIXMAP_SIZE(x, y, cursor.bpp) > sizeof cursor.image)
|
|
| 627 |
goto badcmd;
|
|
| 625 |
if (SVGA_BITMAP_SIZE(x, y) > sizeof cursor.mask ||
|
|
| 626 |
SVGA_PIXMAP_SIZE(x, y, cursor.bpp) > sizeof cursor.image)
|
|
| 627 |
goto badcmd;
|
|
| 628 | 628 |
|
| 629 | 629 |
len -= args; |
| 630 | 630 |
if (len < 0) |
| ... | ... | |
| 857 | 857 |
s->invalidated = 1; |
| 858 | 858 |
s->vga.invalidate(&s->vga); |
| 859 | 859 |
if (s->enable) {
|
| 860 |
s->fb_size = ((s->depth + 7) >> 3) * s->new_width * s->new_height;
|
|
| 861 |
vga_dirty_log_stop(&s->vga);
|
|
| 862 |
} else {
|
|
| 863 |
vga_dirty_log_start(&s->vga);
|
|
| 864 |
}
|
|
| 860 |
s->fb_size = ((s->depth + 7) >> 3) * s->new_width * s->new_height;
|
|
| 861 |
vga_dirty_log_stop(&s->vga);
|
|
| 862 |
} else {
|
|
| 863 |
vga_dirty_log_start(&s->vga);
|
|
| 864 |
}
|
|
| 865 | 865 |
break; |
| 866 | 866 |
|
| 867 | 867 |
case SVGA_REG_WIDTH: |
| ... | ... | |
| 1303 | 1303 |
PCI_BASE_ADDRESS_MEM_PREFETCH, pci_vmsvga_map_mem); |
| 1304 | 1304 |
|
| 1305 | 1305 |
pci_register_bar(&s->card, 2, SVGA_FIFO_SIZE, |
| 1306 |
PCI_BASE_ADDRESS_MEM_PREFETCH, pci_vmsvga_map_fifo);
|
|
| 1306 |
PCI_BASE_ADDRESS_MEM_PREFETCH, pci_vmsvga_map_fifo);
|
|
| 1307 | 1307 |
|
| 1308 | 1308 |
vmsvga_init(&s->chip, VGA_RAM_SIZE); |
| 1309 | 1309 |
|
Also available in: Unified diff