From nobody Sun Nov 9 15:06:02 2025 Delivered-To: importer@patchew.org Received-SPF: temperror (zoho.com: Error in retrieving data from DNS) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=temperror (zoho.com: Error in retrieving data from DNS) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1550652600561577.120306708554; Wed, 20 Feb 2019 00:50:00 -0800 (PST) Received: from localhost ([127.0.0.1]:36227 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gwNZf-0006wm-De for importer@patchew.org; Wed, 20 Feb 2019 03:49:51 -0500 Received: from eggs.gnu.org ([209.51.188.92]:53314) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gwNXx-0005yO-0i for qemu-devel@nongnu.org; Wed, 20 Feb 2019 03:48:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gwNXv-0008N5-QH for qemu-devel@nongnu.org; Wed, 20 Feb 2019 03:48:04 -0500 Received: from mx1.redhat.com ([209.132.183.28]:38302) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gwNXv-0008LT-Db for qemu-devel@nongnu.org; Wed, 20 Feb 2019 03:48:03 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 3C7C683F3C; Wed, 20 Feb 2019 08:48:01 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-116-228.ams2.redhat.com [10.36.116.228]) by smtp.corp.redhat.com (Postfix) with ESMTP id C09CA600C0; Wed, 20 Feb 2019 08:47:54 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 098BE11AB5; Wed, 20 Feb 2019 09:47:54 +0100 (CET) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Wed, 20 Feb 2019 09:47:51 +0100 Message-Id: <20190220084753.9130-2-kraxel@redhat.com> In-Reply-To: <20190220084753.9130-1-kraxel@redhat.com> References: <20190220084753.9130-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Wed, 20 Feb 2019 08:48:01 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v2 1/3] vfio/display: add edid support. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Alex Williamson , intel-gvt-dev@lists.freedesktop.org, Gerd Hoffmann Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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 --- include/hw/vfio/vfio-common.h | 3 + hw/vfio/display.c | 127 ++++++++++++++++++++++++++++++++++++++= ++++ hw/vfio/trace-events | 7 +++ 3 files changed, 137 insertions(+) diff --git a/include/hw/vfio/vfio-common.h b/include/hw/vfio/vfio-common.h index 7624c9f511..5f7f709b95 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; diff --git a/hw/vfio/display.c b/hw/vfio/display.c index dead30e626..ed2eb19ea3 100644 --- a/hw/vfio/display.c +++ b/hw/vfio/display.c @@ -15,15 +15,139 @@ #include =20 #include "sysemu/sysemu.h" +#include "hw/display/edid.h" #include "ui/console.h" #include "qapi/error.h" #include "pci.h" +#include "trace.h" =20 #ifndef DRM_PLANE_TYPE_PRIMARY # define DRM_PLANE_TYPE_PRIMARY 1 # define DRM_PLANE_TYPE_CURSOR 2 #endif =20 +#define pread_field(_fd, _reg, _ptr, _fld) \ + if (sizeof(_ptr->_fld) !=3D \ + pread(_fd, &(_ptr->_fld), sizeof(_ptr->_fld), \ + _reg->offset + offsetof(typeof(*_ptr), _fld))) \ + goto err; +#define pwrite_field(_fd, _reg, _ptr, _fld) \ + if (sizeof(_ptr->_fld) !=3D \ + pwrite(_fd, &(_ptr->_fld), sizeof(_ptr->_fld), \ + _reg->offset + offsetof(typeof(*_ptr), _fld))) \ + goto err; + + +static void vfio_display_edid_update(VFIOPCIDevice *vdev, bool enabled, + int prefx, int prefy) +{ + VFIODisplay *dpy =3D vdev->dpy; + int fd =3D vdev->vbasedev.fd; + qemu_edid_info edid =3D { + .maxx =3D dpy->edid_regs->max_xres, + .maxy =3D dpy->edid_regs->max_yres, + .prefx =3D prefx, + .prefy =3D prefy, + }; + + dpy->edid_regs->link_state =3D VFIO_DEVICE_GFX_LINK_STATE_DOWN; + pwrite_field(fd, dpy->edid_info, dpy->edid_regs, link_state); + trace_vfio_display_edid_link_down(); + + if (!enabled) { + return; + } + + if (edid.maxx && edid.prefx > edid.maxx) { + edid.prefx =3D edid.maxx; + } + if (edid.maxy && edid.prefy > edid.maxy) { + edid.prefy =3D 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 =3D qemu_edid_size(dpy->edid_blob); + pwrite_field(fd, dpy->edid_info, dpy->edid_regs, edid_size); + if (pwrite(fd, dpy->edid_blob, dpy->edid_regs->edid_size, + dpy->edid_info->offset + dpy->edid_regs->edid_offset) + !=3D dpy->edid_regs->edid_size) { + goto err; + } + + dpy->edid_regs->link_state =3D VFIO_DEVICE_GFX_LINK_STATE_UP; + pwrite_field(fd, dpy->edid_info, dpy->edid_regs, link_state); + 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 =3D opaque; + VFIODisplay *dpy =3D 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 =3D vdev->dpy; + int fd =3D vdev->vbasedev.fd; + int ret; + + ret =3D 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 =3D g_new0(struct vfio_region_gfx_edid, 1); + pread_field(fd, dpy->edid_info, dpy->edid_regs, edid_offset); + pread_field(fd, dpy->edid_info, dpy->edid_regs, edid_max_size); + pread_field(fd, dpy->edid_info, dpy->edid_regs, max_xres); + pread_field(fd, dpy->edid_info, dpy->edid_regs, max_yres); + dpy->edid_blob =3D g_malloc0(dpy->edid_regs->edid_max_size); + + vfio_display_edid_update(vdev, true, 0, 0); + return; + +err: + fprintf(stderr, "%s: Oops, pread error\n", __func__); + g_free(dpy->edid_regs); + dpy->edid_regs =3D 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 +295,7 @@ static void vfio_display_dmabuf_update(void *opaque) =20 static const GraphicHwOps vfio_display_dmabuf_ops =3D { .gfx_update =3D vfio_display_dmabuf_update, + .ui_info =3D vfio_display_edid_ui_info, }; =20 static int vfio_display_dmabuf_init(VFIOPCIDevice *vdev, Error **errp) @@ -187,6 +312,7 @@ static int vfio_display_dmabuf_init(VFIOPCIDevice *vdev= , Error **errp) if (vdev->enable_ramfb) { vdev->dpy->ramfb =3D ramfb_setup(errp); } + vfio_display_edid_init(vdev); return 0; } =20 @@ -366,5 +492,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 f41ca96160..28d445caaf 100644 --- a/hw/vfio/trace-events +++ b/hw/vfio/trace-events @@ -131,3 +131,10 @@ vfio_prereg_unregister(uint64_t va, uint64_t size, int= ret) "va=3D0x%"PRIx64" size vfio_spapr_create_window(int ps, uint64_t ws, uint64_t off) "pageshift=3D0= x%x winsize=3D0x%"PRIx64" offset=3D0x%"PRIx64 vfio_spapr_remove_window(uint64_t off) "offset=3D0x%"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) "%dx%d" +vfio_display_edid_write_error(void) "" --=20 2.9.3