Commit 7e2d0886 authored by Peter Maydell's avatar Peter Maydell
Browse files

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



vga: bugfix collection.

# gpg: Signature made Tue 26 Jun 2018 17:27:23 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-20180626-pull-request:
  virtio-gpu-3d: Drop workaround for VIRTIO_GPU_CAPSET_VIRGL2 define
  ramfb: fix overflow
  vga: set owner for mmio regions

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 0ab4c574 fd1cfb87

hw/display/ramfb.c

+2 −2
Original line number Diff line number Diff line
@@ -36,8 +36,8 @@ static void ramfb_fw_cfg_write(void *dev, off_t offset, size_t len) 
{

    RAMFBState *s = dev;

    void *framebuffer;

    uint32_t stride, fourcc, format;

    hwaddr addr, length;

    uint32_t fourcc, format;

    hwaddr stride, addr, length;



    s->width  = be32_to_cpu(s->cfg.width);

    s->height = be32_to_cpu(s->cfg.height);

hw/display/vga-pci.c

+6 −5
Original line number Diff line number Diff line
@@ -192,22 +192,23 @@ static const MemoryRegionOps pci_vga_qext_ops = { 
};



void pci_std_vga_mmio_region_init(VGACommonState *s,

                                  Object *owner,

                                  MemoryRegion *parent,

                                  MemoryRegion *subs,

                                  bool qext)

{

    memory_region_init_io(&subs[0], NULL, &pci_vga_ioport_ops, s,

    memory_region_init_io(&subs[0], owner, &pci_vga_ioport_ops, s,

                          "vga ioports remapped", PCI_VGA_IOPORT_SIZE);

    memory_region_add_subregion(parent, PCI_VGA_IOPORT_OFFSET,

                                &subs[0]);



    memory_region_init_io(&subs[1], NULL, &pci_vga_bochs_ops, s,

    memory_region_init_io(&subs[1], owner, &pci_vga_bochs_ops, s,

                          "bochs dispi interface", PCI_VGA_BOCHS_SIZE);

    memory_region_add_subregion(parent, PCI_VGA_BOCHS_OFFSET,

                                &subs[1]);



    if (qext) {

        memory_region_init_io(&subs[2], NULL, &pci_vga_qext_ops, s,

        memory_region_init_io(&subs[2], owner, &pci_vga_qext_ops, s,

                              "qemu extended regs", PCI_VGA_QEXT_SIZE);

        memory_region_add_subregion(parent, PCI_VGA_QEXT_OFFSET,

                                    &subs[2]);
@@ -239,7 +240,7 @@ static void pci_std_vga_realize(PCIDevice *dev, Error **errp) 
            qext = true;

            pci_set_byte(&d->dev.config[PCI_REVISION_ID], 2);

        }

        pci_std_vga_mmio_region_init(s, &d->mmio, d->mrs, qext);

        pci_std_vga_mmio_region_init(s, OBJECT(dev), &d->mmio, d->mrs, qext);



        pci_register_bar(&d->dev, 2, PCI_BASE_ADDRESS_SPACE_MEMORY, &d->mmio);

    }
@@ -275,7 +276,7 @@ static void pci_secondary_vga_realize(PCIDevice *dev, Error **errp) 
        qext = true;

        pci_set_byte(&d->dev.config[PCI_REVISION_ID], 2);

    }

    pci_std_vga_mmio_region_init(s, &d->mmio, d->mrs, qext);

    pci_std_vga_mmio_region_init(s, OBJECT(dev), &d->mmio, d->mrs, qext);



    pci_register_bar(&d->dev, 0, PCI_BASE_ADDRESS_MEM_PREFETCH, &s->vram);

    pci_register_bar(&d->dev, 2, PCI_BASE_ADDRESS_SPACE_MEMORY, &d->mmio);

hw/display/vga_int.h

+1 −0
Original line number Diff line number Diff line
@@ -193,6 +193,7 @@ extern const MemoryRegionOps vga_mem_ops; 


/* vga-pci.c */

void pci_std_vga_mmio_region_init(VGACommonState *s,

                                  Object *owner,

                                  MemoryRegion *parent,

                                  MemoryRegion *subs,

                                  bool qext);

hw/display/virtio-vga.c

+1 −1
Original line number Diff line number Diff line
@@ -152,7 +152,7 @@ static void virtio_vga_realize(VirtIOPCIProxy *vpci_dev, Error **errp) 
    }



    /* add stdvga mmio regions */

    pci_std_vga_mmio_region_init(vga, &vpci_dev->modern_bar,

    pci_std_vga_mmio_region_init(vga, OBJECT(vvga), &vpci_dev->modern_bar,

                                 vvga->vga_mrs, true);



    vga->con = g->scanout[0].con;

include/hw/virtio/virtio-gpu.h

+0 −5
Original line number Diff line number Diff line
@@ -22,11 +22,6 @@ 


#include "standard-headers/linux/virtio_gpu.h"



/* Not yet(?) defined in standard-headers, remove when possible */

#ifndef VIRTIO_GPU_CAPSET_VIRGL2

#define VIRTIO_GPU_CAPSET_VIRGL2 2

#endif



#define TYPE_VIRTIO_GPU "virtio-gpu-device"

#define VIRTIO_GPU(obj)                                        \

        OBJECT_CHECK(VirtIOGPU, (obj), TYPE_VIRTIO_GPU)