diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2019-05-24 12:09:23 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2019-05-24 12:09:23 +0100 |
| commit | 40575757e1ef9fa8e34c2320fb56a7dffd92efcc (patch) | |
| tree | 61c0f8af9a81637f914be3e38768a2b8d7e4113f /hw/vfio/display.c | |
| parent | 636011255dec55da4cac28240ffcaa2e740f1e81 (diff) | |
| parent | f79081b4b71b72640bedd40a7cd76f864c8287f1 (diff) | |
| download | focaccia-qemu-40575757e1ef9fa8e34c2320fb56a7dffd92efcc.tar.gz focaccia-qemu-40575757e1ef9fa8e34c2320fb56a7dffd92efcc.zip | |
Merge remote-tracking branch 'remotes/kraxel/tags/vga-20190524-pull-request' into staging
ramfb: misc improvements. # gpg: Signature made Fri 24 May 2019 09:56:59 BST # gpg: using RSA key 4CB6D8EED3E87138 # gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>" [full] # gpg: aka "Gerd Hoffmann <gerd@kraxel.org>" [full] # gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>" [full] # Primary key fingerprint: A032 8CFF B93A 17A7 9901 FE7D 4CB6 D8EE D3E8 7138 * remotes/kraxel/tags/vga-20190524-pull-request: hw/display/ramfb: initialize fw-config space with xres/ yres hw/display/ramfb: lock guest resolution after it's set hw/display/ramfb: fix guest memory un-mapping Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/vfio/display.c')
| -rw-r--r-- | hw/vfio/display.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/vfio/display.c b/hw/vfio/display.c index a3d9c8f5be..2c2d3e5b71 100644 --- a/hw/vfio/display.c +++ b/hw/vfio/display.c @@ -352,7 +352,7 @@ static int vfio_display_dmabuf_init(VFIOPCIDevice *vdev, Error **errp) &vfio_display_dmabuf_ops, vdev); if (vdev->enable_ramfb) { - vdev->dpy->ramfb = ramfb_setup(errp); + vdev->dpy->ramfb = ramfb_setup(DEVICE(vdev), errp); } vfio_display_edid_init(vdev); return 0; @@ -478,7 +478,7 @@ static int vfio_display_region_init(VFIOPCIDevice *vdev, Error **errp) &vfio_display_region_ops, vdev); if (vdev->enable_ramfb) { - vdev->dpy->ramfb = ramfb_setup(errp); + vdev->dpy->ramfb = ramfb_setup(DEVICE(vdev), errp); } return 0; } |