diff options
| author | Peter Maydell | 2019-06-07 15:53:00 +0200 |
|---|---|---|
| committer | Peter Maydell | 2019-06-07 15:53:00 +0200 |
| commit | 9021fcfb883a17908a74a0ba1c09ff3b1bf97ebb (patch) | |
| tree | 47129c300bbb3950f5cc7566770e82560072faee /hw/vfio/display.c | |
| parent | Merge remote-tracking branch 'remotes/amarkovic/tags/mips-queue-jun-7-2019' i... (diff) | |
| parent | egl-helpers: add modifier support to egl_dmabuf_import_texture() (diff) | |
| download | qemu-9021fcfb883a17908a74a0ba1c09ff3b1bf97ebb.tar.gz qemu-9021fcfb883a17908a74a0ba1c09ff3b1bf97ebb.tar.xz qemu-9021fcfb883a17908a74a0ba1c09ff3b1bf97ebb.zip | |
Merge remote-tracking branch 'remotes/kraxel/tags/ui-20190607-pull-request' into staging
curses: 32bit build fix.
egl: dmabuf modifier support.
# gpg: Signature made Fri 07 Jun 2019 14:18:41 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/ui-20190607-pull-request:
egl-helpers: add modifier support to egl_dmabuf_import_texture()
egl-helpers: add modifier support to egl_get_fd_for_texture().
vfio/display: set dmabuf modifier field
console: add dmabuf modifier field.
ui/curses: Fix build with -m32
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/vfio/display.c')
| -rw-r--r-- | hw/vfio/display.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/hw/vfio/display.c b/hw/vfio/display.c index 2c2d3e5b71..a5a608c5b2 100644 --- a/hw/vfio/display.c +++ b/hw/vfio/display.c @@ -248,6 +248,7 @@ static VFIODMABuf *vfio_display_get_dmabuf(VFIOPCIDevice *vdev, dmabuf->buf.height = plane.height; dmabuf->buf.stride = plane.stride; dmabuf->buf.fourcc = plane.drm_format; + dmabuf->buf.modifier = plane.drm_format_mod; dmabuf->buf.fd = fd; if (plane_type == DRM_PLANE_TYPE_CURSOR) { vfio_display_update_cursor(dmabuf, &plane); |