* [Qemu-devel] [PULL 1/3] vfio/display: add edid support.
2019-03-11 19:22 [Qemu-devel] [PULL 0/3] vfio updates 2019-03-11 Alex Williamson
@ 2019-03-11 19:22 ` Alex Williamson
2019-03-11 19:23 ` [Qemu-devel] [PULL 2/3] vfio/display: add xres + yres properties Alex Williamson
2019-03-11 19:23 ` [Qemu-devel] [PULL 3/3] vfio/display: delay link up event Alex Williamson
2 siblings, 0 replies; 4+ messages in thread
From: Alex Williamson @ 2019-03-11 19:22 UTC (permalink / raw)
To: qemu-devel
From: Gerd Hoffmann <kraxel@redhat.com>
This patch adds EDID support to the vfio display (aka vgpu) code.
When supported by the mdev driver qemu will generate a EDID blob
and pass it on using the new vfio edid region. The EDID blob will
be updated on UI changes (i.e. window resize), so the guest can
adapt.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Liam Merwick <liam.merwick@oracle.com>
[remove control flow via macro, use unsigned format specifier]
Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
---
hw/vfio/display.c | 141 +++++++++++++++++++++++++++++++++++++++++
hw/vfio/trace-events | 7 ++
include/hw/vfio/vfio-common.h | 3 +
3 files changed, 151 insertions(+)
diff --git a/hw/vfio/display.c b/hw/vfio/display.c
index dead30e626cb..276fba090d8b 100644
--- a/hw/vfio/display.c
+++ b/hw/vfio/display.c
@@ -15,15 +15,153 @@
#include <sys/ioctl.h>
#include "sysemu/sysemu.h"
+#include "hw/display/edid.h"
#include "ui/console.h"
#include "qapi/error.h"
#include "pci.h"
+#include "trace.h"
#ifndef DRM_PLANE_TYPE_PRIMARY
# define DRM_PLANE_TYPE_PRIMARY 1
# define DRM_PLANE_TYPE_CURSOR 2
#endif
+#define pread_field(_fd, _reg, _ptr, _fld) \
+ (sizeof(_ptr->_fld) != \
+ pread(_fd, &(_ptr->_fld), sizeof(_ptr->_fld), \
+ _reg->offset + offsetof(typeof(*_ptr), _fld)))
+
+#define pwrite_field(_fd, _reg, _ptr, _fld) \
+ (sizeof(_ptr->_fld) != \
+ pwrite(_fd, &(_ptr->_fld), sizeof(_ptr->_fld), \
+ _reg->offset + offsetof(typeof(*_ptr), _fld)))
+
+
+static void vfio_display_edid_update(VFIOPCIDevice *vdev, bool enabled,
+ int prefx, int prefy)
+{
+ VFIODisplay *dpy = vdev->dpy;
+ int fd = vdev->vbasedev.fd;
+ qemu_edid_info edid = {
+ .maxx = dpy->edid_regs->max_xres,
+ .maxy = dpy->edid_regs->max_yres,
+ .prefx = prefx,
+ .prefy = prefy,
+ };
+
+ dpy->edid_regs->link_state = VFIO_DEVICE_GFX_LINK_STATE_DOWN;
+ if (pwrite_field(fd, dpy->edid_info, dpy->edid_regs, link_state)) {
+ goto err;
+ }
+ trace_vfio_display_edid_link_down();
+
+ if (!enabled) {
+ return;
+ }
+
+ if (edid.maxx && edid.prefx > edid.maxx) {
+ edid.prefx = edid.maxx;
+ }
+ if (edid.maxy && edid.prefy > edid.maxy) {
+ edid.prefy = edid.maxy;
+ }
+ qemu_edid_generate(dpy->edid_blob,
+ dpy->edid_regs->edid_max_size,
+ &edid);
+ trace_vfio_display_edid_update(edid.prefx, edid.prefy);
+
+ dpy->edid_regs->edid_size = qemu_edid_size(dpy->edid_blob);
+ if (pwrite_field(fd, dpy->edid_info, dpy->edid_regs, edid_size)) {
+ goto err;
+ }
+ if (pwrite(fd, dpy->edid_blob, dpy->edid_regs->edid_size,
+ dpy->edid_info->offset + dpy->edid_regs->edid_offset)
+ != dpy->edid_regs->edid_size) {
+ goto err;
+ }
+
+ dpy->edid_regs->link_state = VFIO_DEVICE_GFX_LINK_STATE_UP;
+ if (pwrite_field(fd, dpy->edid_info, dpy->edid_regs, link_state)) {
+ goto err;
+ }
+ trace_vfio_display_edid_link_up();
+ return;
+
+err:
+ trace_vfio_display_edid_write_error();
+ return;
+}
+
+static int vfio_display_edid_ui_info(void *opaque, uint32_t idx,
+ QemuUIInfo *info)
+{
+ VFIOPCIDevice *vdev = opaque;
+ VFIODisplay *dpy = vdev->dpy;
+
+ if (!dpy->edid_regs) {
+ return 0;
+ }
+
+ if (info->width && info->height) {
+ vfio_display_edid_update(vdev, true, info->width, info->height);
+ } else {
+ vfio_display_edid_update(vdev, false, 0, 0);
+ }
+
+ return 0;
+}
+
+static void vfio_display_edid_init(VFIOPCIDevice *vdev)
+{
+ VFIODisplay *dpy = vdev->dpy;
+ int fd = vdev->vbasedev.fd;
+ int ret;
+
+ ret = vfio_get_dev_region_info(&vdev->vbasedev,
+ VFIO_REGION_TYPE_GFX,
+ VFIO_REGION_SUBTYPE_GFX_EDID,
+ &dpy->edid_info);
+ if (ret) {
+ return;
+ }
+
+ trace_vfio_display_edid_available();
+ dpy->edid_regs = g_new0(struct vfio_region_gfx_edid, 1);
+ if (pread_field(fd, dpy->edid_info, dpy->edid_regs, edid_offset)) {
+ goto err;
+ }
+ if (pread_field(fd, dpy->edid_info, dpy->edid_regs, edid_max_size)) {
+ goto err;
+ }
+ if (pread_field(fd, dpy->edid_info, dpy->edid_regs, max_xres)) {
+ goto err;
+ }
+ if (pread_field(fd, dpy->edid_info, dpy->edid_regs, max_yres)) {
+ goto err;
+ }
+
+ dpy->edid_blob = g_malloc0(dpy->edid_regs->edid_max_size);
+
+ vfio_display_edid_update(vdev, true, 0, 0);
+ return;
+
+err:
+ trace_vfio_display_edid_write_error();
+ g_free(dpy->edid_regs);
+ dpy->edid_regs = NULL;
+ return;
+}
+
+static void vfio_display_edid_exit(VFIODisplay *dpy)
+{
+ if (!dpy->edid_regs) {
+ return;
+ }
+
+ g_free(dpy->edid_regs);
+ g_free(dpy->edid_blob);
+}
+
static void vfio_display_update_cursor(VFIODMABuf *dmabuf,
struct vfio_device_gfx_plane_info *plane)
{
@@ -171,6 +309,7 @@ static void vfio_display_dmabuf_update(void *opaque)
static const GraphicHwOps vfio_display_dmabuf_ops = {
.gfx_update = vfio_display_dmabuf_update,
+ .ui_info = vfio_display_edid_ui_info,
};
static int vfio_display_dmabuf_init(VFIOPCIDevice *vdev, Error **errp)
@@ -187,6 +326,7 @@ static int vfio_display_dmabuf_init(VFIOPCIDevice *vdev, Error **errp)
if (vdev->enable_ramfb) {
vdev->dpy->ramfb = ramfb_setup(errp);
}
+ vfio_display_edid_init(vdev);
return 0;
}
@@ -366,5 +506,6 @@ void vfio_display_finalize(VFIOPCIDevice *vdev)
graphic_console_close(vdev->dpy->con);
vfio_display_dmabuf_exit(vdev->dpy);
vfio_display_region_exit(vdev->dpy);
+ vfio_display_edid_exit(vdev->dpy);
g_free(vdev->dpy);
}
diff --git a/hw/vfio/trace-events b/hw/vfio/trace-events
index ed2f333ad726..decbde495ac2 100644
--- a/hw/vfio/trace-events
+++ b/hw/vfio/trace-events
@@ -132,3 +132,10 @@ vfio_prereg_unregister(uint64_t va, uint64_t size, int ret) "va=0x%"PRIx64" size
vfio_spapr_create_window(int ps, uint64_t ws, uint64_t off) "pageshift=0x%x winsize=0x%"PRIx64" offset=0x%"PRIx64
vfio_spapr_remove_window(uint64_t off) "offset=0x%"PRIx64
vfio_spapr_group_attach(int groupfd, int tablefd) "Attached groupfd %d to liobn fd %d"
+
+# hw/vfio/display.c
+vfio_display_edid_available(void) ""
+vfio_display_edid_link_up(void) ""
+vfio_display_edid_link_down(void) ""
+vfio_display_edid_update(uint32_t prefx, uint32_t prefy) "%ux%u"
+vfio_display_edid_write_error(void) ""
diff --git a/include/hw/vfio/vfio-common.h b/include/hw/vfio/vfio-common.h
index 7624c9f511c4..5f7f709b95f1 100644
--- a/include/hw/vfio/vfio-common.h
+++ b/include/hw/vfio/vfio-common.h
@@ -148,6 +148,9 @@ typedef struct VFIODMABuf {
typedef struct VFIODisplay {
QemuConsole *con;
RAMFBState *ramfb;
+ struct vfio_region_info *edid_info;
+ struct vfio_region_gfx_edid *edid_regs;
+ uint8_t *edid_blob;
struct {
VFIORegion buffer;
DisplaySurface *surface;
^ permalink raw reply related [flat|nested] 4+ messages in thread* [Qemu-devel] [PULL 2/3] vfio/display: add xres + yres properties
2019-03-11 19:22 [Qemu-devel] [PULL 0/3] vfio updates 2019-03-11 Alex Williamson
2019-03-11 19:22 ` [Qemu-devel] [PULL 1/3] vfio/display: add edid support Alex Williamson
@ 2019-03-11 19:23 ` Alex Williamson
2019-03-11 19:23 ` [Qemu-devel] [PULL 3/3] vfio/display: delay link up event Alex Williamson
2 siblings, 0 replies; 4+ messages in thread
From: Alex Williamson @ 2019-03-11 19:23 UTC (permalink / raw)
To: qemu-devel
From: Gerd Hoffmann <kraxel@redhat.com>
This allows configure the display resolution which the vgpu should use.
The information will be passed to the guest using EDID, so the mdev
driver must support the vfio edid region for this to work.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Liam Merwick <liam.merwick@oracle.com>
Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
---
hw/vfio/display.c | 12 ++++++++++--
hw/vfio/pci.c | 12 ++++++++++++
hw/vfio/pci.h | 2 ++
3 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/hw/vfio/display.c b/hw/vfio/display.c
index 276fba090d8b..212ad1674ec1 100644
--- a/hw/vfio/display.c
+++ b/hw/vfio/display.c
@@ -45,8 +45,8 @@ static void vfio_display_edid_update(VFIOPCIDevice *vdev, bool enabled,
qemu_edid_info edid = {
.maxx = dpy->edid_regs->max_xres,
.maxy = dpy->edid_regs->max_yres,
- .prefx = prefx,
- .prefy = prefy,
+ .prefx = prefx ?: vdev->display_xres,
+ .prefy = prefy ?: vdev->display_yres,
};
dpy->edid_regs->link_state = VFIO_DEVICE_GFX_LINK_STATE_DOWN;
@@ -142,6 +142,14 @@ static void vfio_display_edid_init(VFIOPCIDevice *vdev)
dpy->edid_blob = g_malloc0(dpy->edid_regs->edid_max_size);
+ /* if xres + yres properties are unset use the maximum resolution */
+ if (!vdev->display_xres) {
+ vdev->display_xres = dpy->edid_regs->max_xres;
+ }
+ if (!vdev->display_yres) {
+ vdev->display_yres = dpy->edid_regs->max_yres;
+ }
+
vfio_display_edid_update(vdev, true, 0, 0);
return;
diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c
index dd12f363915d..504019c4582b 100644
--- a/hw/vfio/pci.c
+++ b/hw/vfio/pci.c
@@ -3068,6 +3068,16 @@ static void vfio_realize(PCIDevice *pdev, Error **errp)
error_setg(errp, "ramfb=on requires display=on");
goto out_teardown;
}
+ if (vdev->display_xres || vdev->display_yres) {
+ if (vdev->dpy == NULL) {
+ error_setg(errp, "xres and yres properties require display=on");
+ goto out_teardown;
+ }
+ if (vdev->dpy->edid_regs == NULL) {
+ error_setg(errp, "xres and yres properties need edid support");
+ goto out_teardown;
+ }
+ }
vfio_register_err_notifier(vdev);
vfio_register_req_notifier(vdev);
@@ -3182,6 +3192,8 @@ static Property vfio_pci_dev_properties[] = {
DEFINE_PROP_STRING("sysfsdev", VFIOPCIDevice, vbasedev.sysfsdev),
DEFINE_PROP_ON_OFF_AUTO("display", VFIOPCIDevice,
display, ON_OFF_AUTO_OFF),
+ DEFINE_PROP_UINT32("xres", VFIOPCIDevice, display_xres, 0),
+ DEFINE_PROP_UINT32("yres", VFIOPCIDevice, display_yres, 0),
DEFINE_PROP_UINT32("x-intx-mmap-timeout-ms", VFIOPCIDevice,
intx.mmap_timeout, 1100),
DEFINE_PROP_BIT("x-vga", VFIOPCIDevice, features,
diff --git a/hw/vfio/pci.h b/hw/vfio/pci.h
index b1ae4c07549a..c11c3f167070 100644
--- a/hw/vfio/pci.h
+++ b/hw/vfio/pci.h
@@ -149,6 +149,8 @@ typedef struct VFIOPCIDevice {
#define VFIO_FEATURE_ENABLE_IGD_OPREGION \
(1 << VFIO_FEATURE_ENABLE_IGD_OPREGION_BIT)
OnOffAuto display;
+ uint32_t display_xres;
+ uint32_t display_yres;
int32_t bootindex;
uint32_t igd_gms;
OffAutoPCIBAR msix_relo;
^ permalink raw reply related [flat|nested] 4+ messages in thread* [Qemu-devel] [PULL 3/3] vfio/display: delay link up event
2019-03-11 19:22 [Qemu-devel] [PULL 0/3] vfio updates 2019-03-11 Alex Williamson
2019-03-11 19:22 ` [Qemu-devel] [PULL 1/3] vfio/display: add edid support Alex Williamson
2019-03-11 19:23 ` [Qemu-devel] [PULL 2/3] vfio/display: add xres + yres properties Alex Williamson
@ 2019-03-11 19:23 ` Alex Williamson
2 siblings, 0 replies; 4+ messages in thread
From: Alex Williamson @ 2019-03-11 19:23 UTC (permalink / raw)
To: qemu-devel
From: Gerd Hoffmann <kraxel@redhat.com>
Kick the display link up event with a 0.1 sec delay,
so the guest has a chance to notice the link down first.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Liam Merwick <liam.merwick@oracle.com>
[update for redefined macro]
Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
---
hw/vfio/display.c | 30 +++++++++++++++++++++++++-----
include/hw/vfio/vfio-common.h | 1 +
2 files changed, 26 insertions(+), 5 deletions(-)
diff --git a/hw/vfio/display.c b/hw/vfio/display.c
index 212ad1674ec1..a3d9c8f5beac 100644
--- a/hw/vfio/display.c
+++ b/hw/vfio/display.c
@@ -37,6 +37,23 @@
_reg->offset + offsetof(typeof(*_ptr), _fld)))
+static void vfio_display_edid_link_up(void *opaque)
+{
+ VFIOPCIDevice *vdev = opaque;
+ VFIODisplay *dpy = vdev->dpy;
+ int fd = vdev->vbasedev.fd;
+
+ dpy->edid_regs->link_state = VFIO_DEVICE_GFX_LINK_STATE_UP;
+ if (pwrite_field(fd, dpy->edid_info, dpy->edid_regs, link_state)) {
+ goto err;
+ }
+ trace_vfio_display_edid_link_up();
+ return;
+
+err:
+ trace_vfio_display_edid_write_error();
+}
+
static void vfio_display_edid_update(VFIOPCIDevice *vdev, bool enabled,
int prefx, int prefy)
{
@@ -49,6 +66,7 @@ static void vfio_display_edid_update(VFIOPCIDevice *vdev, bool enabled,
.prefy = prefy ?: vdev->display_yres,
};
+ timer_del(dpy->edid_link_timer);
dpy->edid_regs->link_state = VFIO_DEVICE_GFX_LINK_STATE_DOWN;
if (pwrite_field(fd, dpy->edid_info, dpy->edid_regs, link_state)) {
goto err;
@@ -80,11 +98,8 @@ static void vfio_display_edid_update(VFIOPCIDevice *vdev, bool enabled,
goto err;
}
- dpy->edid_regs->link_state = VFIO_DEVICE_GFX_LINK_STATE_UP;
- if (pwrite_field(fd, dpy->edid_info, dpy->edid_regs, link_state)) {
- goto err;
- }
- trace_vfio_display_edid_link_up();
+ timer_mod(dpy->edid_link_timer,
+ qemu_clock_get_ms(QEMU_CLOCK_REALTIME) + 100);
return;
err:
@@ -150,6 +165,9 @@ static void vfio_display_edid_init(VFIOPCIDevice *vdev)
vdev->display_yres = dpy->edid_regs->max_yres;
}
+ dpy->edid_link_timer = timer_new_ms(QEMU_CLOCK_REALTIME,
+ vfio_display_edid_link_up, vdev);
+
vfio_display_edid_update(vdev, true, 0, 0);
return;
@@ -168,6 +186,8 @@ static void vfio_display_edid_exit(VFIODisplay *dpy)
g_free(dpy->edid_regs);
g_free(dpy->edid_blob);
+ timer_del(dpy->edid_link_timer);
+ timer_free(dpy->edid_link_timer);
}
static void vfio_display_update_cursor(VFIODMABuf *dmabuf,
diff --git a/include/hw/vfio/vfio-common.h b/include/hw/vfio/vfio-common.h
index 5f7f709b95f1..b65a2f051886 100644
--- a/include/hw/vfio/vfio-common.h
+++ b/include/hw/vfio/vfio-common.h
@@ -151,6 +151,7 @@ typedef struct VFIODisplay {
struct vfio_region_info *edid_info;
struct vfio_region_gfx_edid *edid_regs;
uint8_t *edid_blob;
+ QEMUTimer *edid_link_timer;
struct {
VFIORegion buffer;
DisplaySurface *surface;
^ permalink raw reply related [flat|nested] 4+ messages in thread