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

Merge remote-tracking branch 'remotes/kraxel/tags/vga-20181015-pull-request' into staging 



vga: config tweaks, edid updates, qxl bugfix, install new vgabios blobs.

# gpg: Signature made Mon 15 Oct 2018 10:05:03 BST
# gpg:                using RSA key 4CB6D8EED3E87138
# 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>"
# Primary key fingerprint: A032 8CFF B93A 17A7 9901  FE7D 4CB6 D8EE D3E8 7138

* remotes/kraxel/tags/vga-20181015-pull-request:
  Makefile: Install new vgabios binaries
  hw/display/cirrus_vga: Move "isa-cirrus-vga" device into a separate file
  i2c: switch ddc to use the new edid generator
  qxl: check qxl_phys2virt return value
  bochs-display: wire up edid support
  display: add separate config option for bochs-display
  edid: fix alignment issues

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 046936ed 9f42e0b3

Makefile

+1 −0
Original line number Diff line number Diff line
@@ -802,6 +802,7 @@ bepo cz 
ifdef INSTALL_BLOBS

BLOBS=bios.bin bios-256k.bin sgabios.bin vgabios.bin vgabios-cirrus.bin \

vgabios-stdvga.bin vgabios-vmware.bin vgabios-qxl.bin vgabios-virtio.bin \

vgabios-ramfb.bin vgabios-bochs-display.bin \

ppc_rom.bin openbios-sparc32 openbios-sparc64 openbios-ppc QEMU,tcx.bin QEMU,cgthree.bin \

pxe-e1000.rom pxe-eepro100.rom pxe-ne2k_pci.rom \

pxe-pcnet.rom pxe-rtl8139.rom pxe-virtio.rom \

default-configs/pci.mak

+1 −0
Original line number Diff line number Diff line
@@ -44,5 +44,6 @@ CONFIG_SDHCI=y 
CONFIG_EDU=y

CONFIG_VGA=y

CONFIG_VGA_PCI=y

CONFIG_BOCHS_DISPLAY=y

CONFIG_IVSHMEM_DEVICE=$(CONFIG_IVSHMEM)

CONFIG_ROCKER=y

hw/display/Makefile.objs

+3 −1
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ common-obj-$(CONFIG_FW_CFG_DMA) += ramfb-standalone.o 


common-obj-$(CONFIG_ADS7846) += ads7846.o

common-obj-$(CONFIG_VGA_CIRRUS) += cirrus_vga.o

common-obj-$(call land,$(CONFIG_VGA_CIRRUS),$(CONFIG_VGA_ISA))+=cirrus_vga_isa.o

common-obj-$(CONFIG_G364FB) += g364fb.o

common-obj-$(CONFIG_JAZZ_LED) += jazz_led.o

common-obj-$(CONFIG_PL110) += pl110.o
@@ -14,11 +15,12 @@ common-obj-$(CONFIG_SSD0323) += ssd0323.o 
common-obj-$(CONFIG_XEN) += xenfb.o



common-obj-$(CONFIG_VGA_PCI) += vga-pci.o

common-obj-$(CONFIG_VGA_PCI) += bochs-display.o

common-obj-$(CONFIG_VGA_PCI) += edid-region.o

common-obj-$(CONFIG_VGA_ISA) += vga-isa.o

common-obj-$(CONFIG_VGA_ISA_MM) += vga-isa-mm.o

common-obj-$(CONFIG_VMWARE_VGA) += vmware_vga.o

common-obj-$(CONFIG_BOCHS_DISPLAY) += bochs-display.o

common-obj-$(CONFIG_BOCHS_DISPLAY) += edid-region.o



common-obj-$(CONFIG_BLIZZARD) += blizzard.o

common-obj-$(CONFIG_EXYNOS4) += exynos4210_fimd.o

hw/display/bochs-display.c

+13 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
#include "hw/hw.h"

#include "hw/pci/pci.h"

#include "hw/display/bochs-vbe.h"

#include "hw/display/edid.h"



#include "qapi/error.h"
@@ -35,9 +36,13 @@ typedef struct BochsDisplayState { 
    MemoryRegion     mmio;

    MemoryRegion     vbe;

    MemoryRegion     qext;

    MemoryRegion     edid;



    /* device config */

    uint64_t         vgamem;

    bool             enable_edid;

    qemu_edid_info   edid_info;

    uint8_t          edid_blob[256];



    /* device registers */

    uint16_t         vbe_regs[VBE_DISPI_INDEX_NB];
@@ -283,6 +288,12 @@ static void bochs_display_realize(PCIDevice *dev, Error **errp) 
    pci_register_bar(&s->pci, 0, PCI_BASE_ADDRESS_MEM_PREFETCH, &s->vram);

    pci_register_bar(&s->pci, 2, PCI_BASE_ADDRESS_SPACE_MEMORY, &s->mmio);



    if (s->enable_edid) {

        qemu_edid_generate(s->edid_blob, sizeof(s->edid_blob), &s->edid_info);

        qemu_edid_region_io(&s->edid, obj, s->edid_blob, sizeof(s->edid_blob));

        memory_region_add_subregion(&s->mmio, 0, &s->edid);

    }



    if (pci_bus_is_express(pci_get_bus(dev))) {

        dev->cap_present |= QEMU_PCI_CAP_EXPRESS;

        ret = pcie_endpoint_cap_init(dev, 0x80);
@@ -325,6 +336,8 @@ static void bochs_display_exit(PCIDevice *dev) 


static Property bochs_display_properties[] = {

    DEFINE_PROP_SIZE("vgamem", BochsDisplayState, vgamem, 16 * MiB),

    DEFINE_PROP_BOOL("edid", BochsDisplayState, enable_edid, false),

    DEFINE_EDID_PROPERTIES(BochsDisplayState, edid_info),

    DEFINE_PROP_END_OF_LIST(),

};

hw/display/cirrus_vga.c

+5 −138
Original line number Diff line number Diff line
@@ -33,8 +33,8 @@ 
#include "hw/hw.h"

#include "hw/pci/pci.h"

#include "ui/pixel_ops.h"

#include "vga_int.h"

#include "hw/loader.h"

#include "cirrus_vga_internal.h"



/*

 * TODO:
@@ -52,16 +52,6 @@ 
 *

 ***************************************/



// ID

#define CIRRUS_ID_CLGD5422  (0x23<<2)

#define CIRRUS_ID_CLGD5426  (0x24<<2)

#define CIRRUS_ID_CLGD5424  (0x25<<2)

#define CIRRUS_ID_CLGD5428  (0x26<<2)

#define CIRRUS_ID_CLGD5430  (0x28<<2)

#define CIRRUS_ID_CLGD5434  (0x2A<<2)

#define CIRRUS_ID_CLGD5436  (0x2B<<2)

#define CIRRUS_ID_CLGD5446  (0x2E<<2)



// sequencer 0x07

#define CIRRUS_SR7_BPP_VGA            0x00

#define CIRRUS_SR7_BPP_SVGA           0x01
@@ -176,65 +166,10 @@ 


#define CIRRUS_PNPMMIO_SIZE         0x1000



struct CirrusVGAState;

typedef void (*cirrus_bitblt_rop_t) (struct CirrusVGAState *s,

                                     uint32_t dstaddr, uint32_t srcaddr,

				     int dstpitch, int srcpitch,

				     int bltwidth, int bltheight);

typedef void (*cirrus_fill_t)(struct CirrusVGAState *s,

                              uint32_t dstaddr, int dst_pitch,

                              int width, int height);



typedef struct CirrusVGAState {

    VGACommonState vga;



    MemoryRegion cirrus_vga_io;

    MemoryRegion cirrus_linear_io;

    MemoryRegion cirrus_linear_bitblt_io;

    MemoryRegion cirrus_mmio_io;

    MemoryRegion pci_bar;

    bool linear_vram;  /* vga.vram mapped over cirrus_linear_io */

    MemoryRegion low_mem_container; /* container for 0xa0000-0xc0000 */

    MemoryRegion low_mem;           /* always mapped, overridden by: */

    MemoryRegion cirrus_bank[2];    /*   aliases at 0xa0000-0xb0000  */

    uint32_t cirrus_addr_mask;

    uint32_t linear_mmio_mask;

    uint8_t cirrus_shadow_gr0;

    uint8_t cirrus_shadow_gr1;

    uint8_t cirrus_hidden_dac_lockindex;

    uint8_t cirrus_hidden_dac_data;

    uint32_t cirrus_bank_base[2];

    uint32_t cirrus_bank_limit[2];

    uint8_t cirrus_hidden_palette[48];

    bool enable_blitter;

    int cirrus_blt_pixelwidth;

    int cirrus_blt_width;

    int cirrus_blt_height;

    int cirrus_blt_dstpitch;

    int cirrus_blt_srcpitch;

    uint32_t cirrus_blt_fgcol;

    uint32_t cirrus_blt_bgcol;

    uint32_t cirrus_blt_dstaddr;

    uint32_t cirrus_blt_srcaddr;

    uint8_t cirrus_blt_mode;

    uint8_t cirrus_blt_modeext;

    cirrus_bitblt_rop_t cirrus_rop;

#define CIRRUS_BLTBUFSIZE (2048 * 4) /* one line width */

    uint8_t cirrus_bltbuf[CIRRUS_BLTBUFSIZE];

    uint8_t *cirrus_srcptr;

    uint8_t *cirrus_srcptr_end;

    uint32_t cirrus_srccounter;

    /* hwcursor display state */

    int last_hw_cursor_size;

    int last_hw_cursor_x;

    int last_hw_cursor_y;

    int last_hw_cursor_y_start;

    int last_hw_cursor_y_end;

    int real_vram_size; /* XXX: suppress that */

    int device_id;

    int bustype;

} CirrusVGAState;



typedef struct PCICirrusVGAState {

    PCIDevice dev;

    CirrusVGAState cirrus_vga;
@@ -244,16 +179,6 @@ typedef struct PCICirrusVGAState { 
#define PCI_CIRRUS_VGA(obj) \

    OBJECT_CHECK(PCICirrusVGAState, (obj), TYPE_PCI_CIRRUS_VGA)



#define TYPE_ISA_CIRRUS_VGA "isa-cirrus-vga"

#define ISA_CIRRUS_VGA(obj) \

    OBJECT_CHECK(ISACirrusVGAState, (obj), TYPE_ISA_CIRRUS_VGA)



typedef struct ISACirrusVGAState {

    ISADevice parent_obj;



    CirrusVGAState cirrus_vga;

} ISACirrusVGAState;



static uint8_t rop_to_index[256];



/***************************************
@@ -2829,7 +2754,7 @@ static int cirrus_post_load(void *opaque, int version_id) 
    return 0;

}



static const VMStateDescription vmstate_cirrus_vga = {

const VMStateDescription vmstate_cirrus_vga = {

    .name = "cirrus_vga",

    .version_id = 2,

    .minimum_version_id = 1,
@@ -2932,10 +2857,9 @@ static const MemoryRegionOps cirrus_vga_io_ops = { 
    },

};



static void cirrus_init_common(CirrusVGAState *s, Object *owner,

void cirrus_init_common(CirrusVGAState *s, Object *owner,

                        int device_id, int is_pci,

                               MemoryRegion *system_memory,

                               MemoryRegion *system_io)

                        MemoryRegion *system_memory, MemoryRegion *system_io)

{

    int i;

    static int inited;
@@ -3029,62 +2953,6 @@ static void cirrus_init_common(CirrusVGAState *s, Object *owner, 
    qemu_register_reset(cirrus_reset, s);

}



/***************************************

 *

 *  ISA bus support

 *

 ***************************************/



static void isa_cirrus_vga_realizefn(DeviceState *dev, Error **errp)

{

    ISADevice *isadev = ISA_DEVICE(dev);

    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;

    }

    s->global_vmstate = true;

    vga_common_init(s, OBJECT(dev));

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

                       isa_address_space(isadev),

                       isa_address_space_io(isadev));

    s->con = graphic_console_init(dev, 0, s->hw_ops, s);

    rom_add_vga(VGABIOS_CIRRUS_FILENAME);

    /* XXX ISA-LFB support */

    /* FIXME not qdev yet */

}



static Property isa_cirrus_vga_properties[] = {

    DEFINE_PROP_UINT32("vgamem_mb", struct ISACirrusVGAState,

                       cirrus_vga.vga.vram_size_mb, 4),

    DEFINE_PROP_BOOL("blitter", struct ISACirrusVGAState,

                     cirrus_vga.enable_blitter, true),

    DEFINE_PROP_END_OF_LIST(),

};



static void isa_cirrus_vga_class_init(ObjectClass *klass, void *data)

{

    DeviceClass *dc = DEVICE_CLASS(klass);



    dc->vmsd  = &vmstate_cirrus_vga;

    dc->realize = isa_cirrus_vga_realizefn;

    dc->props = isa_cirrus_vga_properties;

    set_bit(DEVICE_CATEGORY_DISPLAY, dc->categories);

}



static const TypeInfo isa_cirrus_vga_info = {

    .name          = TYPE_ISA_CIRRUS_VGA,

    .parent        = TYPE_ISA_DEVICE,

    .instance_size = sizeof(ISACirrusVGAState),

    .class_init = isa_cirrus_vga_class_init,

};



/***************************************

 *

 *  PCI bus support
@@ -3171,7 +3039,6 @@ static const TypeInfo cirrus_vga_info = { 


static void cirrus_vga_register_types(void)

{

    type_register_static(&isa_cirrus_vga_info);

    type_register_static(&cirrus_vga_info);

}