Commit 4f2280b2 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/mcayland/tags/qemu-sparc-signed' into staging 



tcx: Implement hardware acceleration

# gpg: Signature made Tue 23 Sep 2014 22:52:34 BST using RSA key ID AE0F321F
# gpg: Can't check signature: public key not found

* remotes/mcayland/tags/qemu-sparc-signed:
  tcx: Implement hardware acceleration

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents c0f89681 55d7bfe2

hw/display/tcx.c

+559 −118

File changed.

Preview size limit exceeded, changes collapsed.

hw/sparc/sun4m.c

+37 −19
Original line number Diff line number Diff line
@@ -527,7 +527,7 @@ static void apc_init(hwaddr power_base, qemu_irq cpu_halt) 
    sysbus_connect_irq(s, 0, cpu_halt);

}



static void tcx_init(hwaddr addr, int vram_size, int width,

static void tcx_init(hwaddr addr, qemu_irq irq, int vram_size, int width,

                     int height, int depth)

{

    DeviceState *dev;
@@ -541,25 +541,43 @@ static void tcx_init(hwaddr addr, int vram_size, int width, 
    qdev_prop_set_uint64(dev, "prom_addr", addr);

    qdev_init_nofail(dev);

    s = SYS_BUS_DEVICE(dev);

    /* FCode ROM */



    /* 10/ROM : FCode ROM */

    sysbus_mmio_map(s, 0, addr);

    /* DAC */

    sysbus_mmio_map(s, 1, addr + 0x00200000ULL);

    /* TEC (dummy) */

    sysbus_mmio_map(s, 2, addr + 0x00700000ULL);

    /* THC 24 bit: NetBSD writes here even with 8-bit display: dummy */

    sysbus_mmio_map(s, 3, addr + 0x00301000ULL);

    /* 8-bit plane */

    sysbus_mmio_map(s, 4, addr + 0x00800000ULL);

    if (depth == 24) {

        /* 24-bit plane */

        sysbus_mmio_map(s, 5, addr + 0x02000000ULL);

        /* Control plane */

        sysbus_mmio_map(s, 6, addr + 0x0a000000ULL);

    /* 2/STIP : Stipple */

    sysbus_mmio_map(s, 1, addr + 0x04000000ULL);

    /* 3/BLIT : Blitter */

    sysbus_mmio_map(s, 2, addr + 0x06000000ULL);

    /* 5/RSTIP : Raw Stipple */

    sysbus_mmio_map(s, 3, addr + 0x0c000000ULL);

    /* 6/RBLIT : Raw Blitter */

    sysbus_mmio_map(s, 4, addr + 0x0e000000ULL);

    /* 7/TEC : Transform Engine */

    sysbus_mmio_map(s, 5, addr + 0x00700000ULL);

    /* 8/CMAP  : DAC */

    sysbus_mmio_map(s, 6, addr + 0x00200000ULL);

    /* 9/THC : */

    if (depth == 8) {

        sysbus_mmio_map(s, 7, addr + 0x00300000ULL);

    } else {

        /* THC 8 bit (dummy) */

        sysbus_mmio_map(s, 5, addr + 0x00300000ULL);

        sysbus_mmio_map(s, 7, addr + 0x00301000ULL);

    }

    /* 11/DHC : */

    sysbus_mmio_map(s, 8, addr + 0x00240000ULL);

    /* 12/ALT : */

    sysbus_mmio_map(s, 9, addr + 0x00280000ULL);

    /* 0/DFB8 : 8-bit plane */

    sysbus_mmio_map(s, 10, addr + 0x00800000ULL);

    /* 1/DFB24 : 24bit plane */

    sysbus_mmio_map(s, 11, addr + 0x02000000ULL);

    /* 4/RDFB32: Raw framebuffer. Control plane */

    sysbus_mmio_map(s, 12, addr + 0x0a000000ULL);

    /* 9/THC24bits : NetBSD writes here even with 8-bit display: dummy */

    if (depth == 8) {

        sysbus_mmio_map(s, 13, addr + 0x00301000ULL);

    }



    sysbus_connect_irq(s, 0, irq);

}



static void cg3_init(hwaddr addr, qemu_irq irq, int vram_size, int width,
@@ -976,8 +994,8 @@ static void sun4m_hw_init(const struct sun4m_hwdef *hwdef, 
                exit(1);

            }



            tcx_init(hwdef->tcx_base, 0x00100000, graphic_width, graphic_height,

                     graphic_depth);

            tcx_init(hwdef->tcx_base, slavio_irq[11], 0x00100000,

                     graphic_width, graphic_height, graphic_depth);

        }

    }