Commit 8b818e05 authored by Gerd Hoffmann's avatar Gerd Hoffmann Committed by Alex Williamson
Browse files

vfio/display: adding dmabuf support 



Wire up dmabuf-based display.

Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
Signed-off-by: default avatarAlex Williamson <alex.williamson@redhat.com>
parent 00195ba7

hw/vfio/display.c

+180 −2
Original line number Diff line number Diff line
@@ -19,6 +19,184 @@ 
#include "qapi/error.h"

#include "pci.h"



#ifndef DRM_PLANE_TYPE_PRIMARY

# define DRM_PLANE_TYPE_PRIMARY 1

# define DRM_PLANE_TYPE_CURSOR  2

#endif



static void vfio_display_update_cursor(VFIODMABuf *dmabuf,

                                       struct vfio_device_gfx_plane_info *plane)

{

    if (dmabuf->pos_x != plane->x_pos || dmabuf->pos_y != plane->y_pos) {

        dmabuf->pos_x      = plane->x_pos;

        dmabuf->pos_y      = plane->y_pos;

        dmabuf->pos_updates++;

    }

    if (dmabuf->hot_x != plane->x_hot || dmabuf->hot_y != plane->y_hot) {

        dmabuf->hot_x      = plane->x_hot;

        dmabuf->hot_y      = plane->y_hot;

        dmabuf->hot_updates++;

    }

}



static VFIODMABuf *vfio_display_get_dmabuf(VFIOPCIDevice *vdev,

                                           uint32_t plane_type)

{

    VFIODisplay *dpy = vdev->dpy;

    struct vfio_device_gfx_plane_info plane;

    VFIODMABuf *dmabuf;

    int fd, ret;



    memset(&plane, 0, sizeof(plane));

    plane.argsz = sizeof(plane);

    plane.flags = VFIO_GFX_PLANE_TYPE_DMABUF;

    plane.drm_plane_type = plane_type;

    ret = ioctl(vdev->vbasedev.fd, VFIO_DEVICE_QUERY_GFX_PLANE, &plane);

    if (ret < 0) {

        return NULL;

    }

    if (!plane.drm_format || !plane.size) {

        return NULL;

    }



    QTAILQ_FOREACH(dmabuf, &dpy->dmabuf.bufs, next) {

        if (dmabuf->dmabuf_id == plane.dmabuf_id) {

            /* found in list, move to head, return it */

            QTAILQ_REMOVE(&dpy->dmabuf.bufs, dmabuf, next);

            QTAILQ_INSERT_HEAD(&dpy->dmabuf.bufs, dmabuf, next);

            if (plane_type == DRM_PLANE_TYPE_CURSOR) {

                vfio_display_update_cursor(dmabuf, &plane);

            }

            return dmabuf;

        }

    }



    fd = ioctl(vdev->vbasedev.fd, VFIO_DEVICE_GET_GFX_DMABUF, &plane.dmabuf_id);

    if (fd < 0) {

        return NULL;

    }



    dmabuf = g_new0(VFIODMABuf, 1);

    dmabuf->dmabuf_id  = plane.dmabuf_id;

    dmabuf->buf.width  = plane.width;

    dmabuf->buf.height = plane.height;

    dmabuf->buf.stride = plane.stride;

    dmabuf->buf.fourcc = plane.drm_format;

    dmabuf->buf.fd     = fd;

    if (plane_type == DRM_PLANE_TYPE_CURSOR) {

        vfio_display_update_cursor(dmabuf, &plane);

    }



    QTAILQ_INSERT_HEAD(&dpy->dmabuf.bufs, dmabuf, next);

    return dmabuf;

}



static void vfio_display_free_one_dmabuf(VFIODisplay *dpy, VFIODMABuf *dmabuf)

{

    QTAILQ_REMOVE(&dpy->dmabuf.bufs, dmabuf, next);

    dpy_gl_release_dmabuf(dpy->con, &dmabuf->buf);

    close(dmabuf->buf.fd);

    g_free(dmabuf);

}



static void vfio_display_free_dmabufs(VFIOPCIDevice *vdev)

{

    VFIODisplay *dpy = vdev->dpy;

    VFIODMABuf *dmabuf, *tmp;

    uint32_t keep = 5;



    QTAILQ_FOREACH_SAFE(dmabuf, &dpy->dmabuf.bufs, next, tmp) {

        if (keep > 0) {

            keep--;

            continue;

        }

        assert(dmabuf != dpy->dmabuf.primary);

        vfio_display_free_one_dmabuf(dpy, dmabuf);

    }

}



static void vfio_display_dmabuf_update(void *opaque)

{

    VFIOPCIDevice *vdev = opaque;

    VFIODisplay *dpy = vdev->dpy;

    VFIODMABuf *primary, *cursor;

    bool free_bufs = false, new_cursor = false;;



    primary = vfio_display_get_dmabuf(vdev, DRM_PLANE_TYPE_PRIMARY);

    if (primary == NULL) {

        return;

    }



    if (dpy->dmabuf.primary != primary) {

        dpy->dmabuf.primary = primary;

        qemu_console_resize(dpy->con,

                            primary->buf.width, primary->buf.height);

        dpy_gl_scanout_dmabuf(dpy->con, &primary->buf);

        free_bufs = true;

    }



    cursor = vfio_display_get_dmabuf(vdev, DRM_PLANE_TYPE_CURSOR);

    if (dpy->dmabuf.cursor != cursor) {

        dpy->dmabuf.cursor = cursor;

        new_cursor = true;

        free_bufs = true;

    }



    if (cursor && (new_cursor || cursor->hot_updates)) {

        bool have_hot = (cursor->hot_x != 0xffffffff &&

                         cursor->hot_y != 0xffffffff);

        dpy_gl_cursor_dmabuf(dpy->con, &cursor->buf, have_hot,

                             cursor->hot_x, cursor->hot_y);

        cursor->hot_updates = 0;

    } else if (!cursor && new_cursor) {

        dpy_gl_cursor_dmabuf(dpy->con, NULL, false, 0, 0);

    }



    if (cursor && cursor->pos_updates) {

        dpy_gl_cursor_position(dpy->con,

                               cursor->pos_x,

                               cursor->pos_y);

        cursor->pos_updates = 0;

    }



    dpy_gl_update(dpy->con, 0, 0, primary->buf.width, primary->buf.height);



    if (free_bufs) {

        vfio_display_free_dmabufs(vdev);

    }

}



static const GraphicHwOps vfio_display_dmabuf_ops = {

    .gfx_update = vfio_display_dmabuf_update,

};



static int vfio_display_dmabuf_init(VFIOPCIDevice *vdev, Error **errp)

{

    if (!display_opengl) {

        error_setg(errp, "vfio-display-dmabuf: opengl not available");

        return -1;

    }



    vdev->dpy = g_new0(VFIODisplay, 1);

    vdev->dpy->con = graphic_console_init(DEVICE(vdev), 0,

                                          &vfio_display_dmabuf_ops,

                                          vdev);

    return 0;

}



static void vfio_display_dmabuf_exit(VFIODisplay *dpy)

{

    VFIODMABuf *dmabuf;



    if (QTAILQ_EMPTY(&dpy->dmabuf.bufs)) {

        return;

    }



    while ((dmabuf = QTAILQ_FIRST(&dpy->dmabuf.bufs)) != NULL) {

        vfio_display_free_one_dmabuf(dpy, dmabuf);

    }

}



/* ---------------------------------------------------------------------- */



static void vfio_display_region_update(void *opaque)
@@ -136,8 +314,7 @@ int vfio_display_probe(VFIOPCIDevice *vdev, Error **errp) 
    probe.flags = VFIO_GFX_PLANE_TYPE_PROBE | VFIO_GFX_PLANE_TYPE_DMABUF;

    ret = ioctl(vdev->vbasedev.fd, VFIO_DEVICE_QUERY_GFX_PLANE, &probe);

    if (ret == 0) {

        error_setg(errp, "vfio-display: dmabuf support not implemented yet");

        return -1;

        return vfio_display_dmabuf_init(vdev, errp);

    }



    memset(&probe, 0, sizeof(probe));
@@ -164,6 +341,7 @@ void vfio_display_finalize(VFIOPCIDevice *vdev) 
    }



    graphic_console_close(vdev->dpy->con);

    vfio_display_dmabuf_exit(vdev->dpy);

    vfio_display_region_exit(vdev->dpy);

    g_free(vdev->dpy);

}

include/hw/vfio/vfio-common.h

+14 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include "exec/memory.h"

#include "qemu/queue.h"

#include "qemu/notify.h"

#include "ui/console.h"

#ifdef CONFIG_LINUX

#include <linux/vfio.h>

#endif
@@ -142,12 +143,25 @@ typedef struct VFIOGroup { 
    QLIST_ENTRY(VFIOGroup) container_next;

} VFIOGroup;



typedef struct VFIODMABuf {

    QemuDmaBuf buf;

    uint32_t pos_x, pos_y, pos_updates;

    uint32_t hot_x, hot_y, hot_updates;

    int dmabuf_id;

    QTAILQ_ENTRY(VFIODMABuf) next;

} VFIODMABuf;



typedef struct VFIODisplay {

    QemuConsole *con;

    struct {

        VFIORegion buffer;

        DisplaySurface *surface;

    } region;

    struct {

        QTAILQ_HEAD(, VFIODMABuf) bufs;

        VFIODMABuf *primary;

        VFIODMABuf *cursor;

    } dmabuf;

} VFIODisplay;



void vfio_put_base_device(VFIODevice *vbasedev);