Commit ab6d3749 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/kraxel/tags/pull-vga-20140711-1' into staging 



vga: some cirrus fixes.

# gpg: Signature made Fri 11 Jul 2014 10:38:32 BST using RSA key ID D3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg:                 aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg:                 aka "Gerd Hoffmann (private) <kraxel@gmail.com>"

* remotes/kraxel/tags/pull-vga-20140711-1:
  cirrus: Fix host CPU blits
  cirrus: Fix build of debug code
  cirrus_vga: adding sanity check for vram size

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents aee230d7 d16136d2

hw/display/cirrus_vga.c

+20 −4
Original line number Diff line number Diff line
@@ -2059,7 +2059,7 @@ static void cirrus_vga_mem_write(void *opaque, 
	}

    } else {

#ifdef DEBUG_CIRRUS

        printf("cirrus: mem_writeb " TARGET_FMT_plx " value %02x\n", addr,

        printf("cirrus: mem_writeb " TARGET_FMT_plx " value 0x%02" PRIu64 "\n", addr,

               mem_value);

#endif

    }
@@ -2594,7 +2594,7 @@ static void cirrus_vga_ioport_write(void *opaque, hwaddr addr, uint64_t val, 
	break;

    case 0x3c5:

#ifdef DEBUG_VGA_REG

	printf("vga: write SR%x = 0x%02x\n", s->sr_index, val);

	printf("vga: write SR%x = 0x%02" PRIu64 "\n", s->sr_index, val);

#endif

	cirrus_vga_write_sr(c, val);

        break;
@@ -2619,7 +2619,7 @@ static void cirrus_vga_ioport_write(void *opaque, hwaddr addr, uint64_t val, 
	break;

    case 0x3cf:

#ifdef DEBUG_VGA_REG

	printf("vga: write GR%x = 0x%02x\n", s->gr_index, val);

	printf("vga: write GR%x = 0x%02" PRIu64 "\n", s->gr_index, val);

#endif

	cirrus_vga_write_gr(c, s->gr_index, val);

	break;
@@ -2630,7 +2630,7 @@ static void cirrus_vga_ioport_write(void *opaque, hwaddr addr, uint64_t val, 
    case 0x3b5:

    case 0x3d5:

#ifdef DEBUG_VGA_REG

	printf("vga: write CR%x = 0x%02x\n", s->cr_index, val);

	printf("vga: write CR%x = 0x%02"PRIu64"\n", s->cr_index, val);

#endif

	cirrus_vga_write_cr(c, val);

	break;
@@ -2911,6 +2911,14 @@ static void isa_cirrus_vga_realizefn(DeviceState *dev, Error **errp) 
    ISACirrusVGAState *d = ISA_CIRRUS_VGA(dev);

    VGACommonState *s = &d->cirrus_vga.vga;



    /* follow real hardware, cirrus card emulated has 4 MB video memory.

       Also accept 8 MB/16 MB for backward compatibility. */

    if (s->vram_size_mb != 4 && s->vram_size_mb != 8 &&

        s->vram_size_mb != 16) {

        error_setg(errp, "Invalid cirrus_vga ram size '%u'",

                   s->vram_size_mb);

        return;

    }

    vga_common_init(s, OBJECT(dev), true);

    cirrus_init_common(&d->cirrus_vga, OBJECT(dev), CIRRUS_ID_CLGD5430, 0,

                       isa_address_space(isadev),
@@ -2957,6 +2965,14 @@ static int pci_cirrus_vga_initfn(PCIDevice *dev) 
     PCIDeviceClass *pc = PCI_DEVICE_GET_CLASS(dev);

     int16_t device_id = pc->device_id;



     /* follow real hardware, cirrus card emulated has 4 MB video memory.

       Also accept 8 MB/16 MB for backward compatibility. */

     if (s->vga.vram_size_mb != 4 && s->vga.vram_size_mb != 8 &&

         s->vga.vram_size_mb != 16) {

         error_report("Invalid cirrus_vga ram size '%u'",

                      s->vga.vram_size_mb);

         return -1;

     }

     /* setup VGA */

     vga_common_init(&s->vga, OBJECT(dev), true);

     cirrus_init_common(s, OBJECT(dev), device_id, 1, pci_address_space(dev),

hw/display/cirrus_vga_rop.h

+1 −2
Original line number Diff line number Diff line
@@ -52,8 +52,7 @@ glue(cirrus_bitblt_rop_fwd_, ROP_NAME)(CirrusVGAState *s, 
    dstpitch -= bltwidth;

    srcpitch -= bltwidth;



    if (dstpitch < 0 || srcpitch < 0) {

        /* is 0 valid? srcpitch == 0 could be useful */

    if (bltheight > 1 && (dstpitch < 0 || srcpitch < 0)) {

        return;

    }