subject:"\[Qemu\-devel\] \[PATCH v8 7\/9\] vfio\/display\: core \& wireup"

Re: [Qemu-devel] [PATCH v8 7/9] vfio/display: core & wireup

2018-03-08 Thread Kirti Wankhede


Reviewed By: Kirti Wankhede 

Thanks,
Kirti

On 3/6/2018 5:04 PM, Gerd Hoffmann wrote:
> Infrastructure for display support.  Must be enabled
> using 'display' property.
> 
> Signed-off-by: Gerd Hoffmann 
> ---
>  hw/vfio/pci.h |  4 
>  hw/vfio/display.c | 56 
> +++
>  hw/vfio/pci.c | 10 +
>  hw/vfio/Makefile.objs |  2 +-
>  4 files changed, 71 insertions(+), 1 deletion(-)
>  create mode 100644 hw/vfio/display.c
> 
> diff --git a/hw/vfio/pci.h b/hw/vfio/pci.h
> index f4aa13e021..a846cf6237 100644
> --- a/hw/vfio/pci.h
> +++ b/hw/vfio/pci.h
> @@ -133,6 +133,7 @@ typedef struct VFIOPCIDevice {
>  #define VFIO_FEATURE_ENABLE_IGD_OPREGION_BIT 2
>  #define VFIO_FEATURE_ENABLE_IGD_OPREGION \
>  (1 << VFIO_FEATURE_ENABLE_IGD_OPREGION_BIT)
> +OnOffAuto display;
>  int32_t bootindex;
>  uint32_t igd_gms;
>  OffAutoPCIBAR msix_relo;
> @@ -174,4 +175,7 @@ int vfio_pci_igd_opregion_init(VFIOPCIDevice *vdev,
> struct vfio_region_info *info,
> Error **errp);
>  
> +int vfio_display_probe(VFIOPCIDevice *vdev, Error **errp);
> +void vfio_display_finalize(VFIOPCIDevice *vdev);
> +
>  #endif /* HW_VFIO_VFIO_PCI_H */
> diff --git a/hw/vfio/display.c b/hw/vfio/display.c
> new file mode 100644
> index 00..3e997f8a44
> --- /dev/null
> +++ b/hw/vfio/display.c
> @@ -0,0 +1,56 @@
> +/*
> + * display support for mdev based vgpu devices
> + *
> + * Copyright Red Hat, Inc. 2017
> + *
> + * Authors:
> + *Gerd Hoffmann
> + *
> + * This work is licensed under the terms of the GNU GPL, version 2.  See
> + * the COPYING file in the top-level directory.
> + */
> +
> +#include "qemu/osdep.h"
> +#include 
> +#include 
> +
> +#include "sysemu/sysemu.h"
> +#include "ui/console.h"
> +#include "qapi/error.h"
> +#include "pci.h"
> +
> +int vfio_display_probe(VFIOPCIDevice *vdev, Error **errp)
> +{
> +struct vfio_device_gfx_plane_info probe;
> +int ret;
> +
> +memset(, 0, sizeof(probe));
> +probe.argsz = sizeof(probe);
> +probe.flags = VFIO_GFX_PLANE_TYPE_PROBE | VFIO_GFX_PLANE_TYPE_DMABUF;
> +ret = ioctl(vdev->vbasedev.fd, VFIO_DEVICE_QUERY_GFX_PLANE, );
> +if (ret == 0) {
> +error_setg(errp, "vfio-display: dmabuf support not implemented yet");
> +return -1;
> +}
> +
> +memset(, 0, sizeof(probe));
> +probe.argsz = sizeof(probe);
> +probe.flags = VFIO_GFX_PLANE_TYPE_PROBE | VFIO_GFX_PLANE_TYPE_REGION;
> +ret = ioctl(vdev->vbasedev.fd, VFIO_DEVICE_QUERY_GFX_PLANE, );
> +if (ret == 0) {
> +error_setg(errp, "vfio-display: region support not implemented yet");
> +return -1;
> +}
> +
> +if (vdev->display == ON_OFF_AUTO_AUTO) {
> +/* not an error in automatic mode */
> +return 0;
> +}
> +
> +error_setg(errp, "vfio: device doesn't support any (known) display 
> method");
> +return -1;
> +}
> +
> +void vfio_display_finalize(VFIOPCIDevice *vdev)
> +{
> +}
> diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c
> index 033cc8dea1..20f93bef74 100644
> --- a/hw/vfio/pci.c
> +++ b/hw/vfio/pci.c
> @@ -3015,6 +3015,13 @@ static void vfio_realize(PCIDevice *pdev, Error **errp)
>  }
>  }
>  
> +if (vdev->display != ON_OFF_AUTO_OFF) {
> +ret = vfio_display_probe(vdev, errp);
> +if (ret) {
> +goto out_teardown;
> +}
> +}
> +
>  vfio_register_err_notifier(vdev);
>  vfio_register_req_notifier(vdev);
>  vfio_setup_resetfn_quirk(vdev);
> @@ -3035,6 +3042,7 @@ static void vfio_instance_finalize(Object *obj)
>  VFIOPCIDevice *vdev = DO_UPCAST(VFIOPCIDevice, pdev, pci_dev);
>  VFIOGroup *group = vdev->vbasedev.group;
>  
> +vfio_display_finalize(vdev);
>  vfio_bars_finalize(vdev);
>  g_free(vdev->emulated_config_bits);
>  g_free(vdev->rom);
> @@ -3123,6 +3131,8 @@ static void vfio_instance_init(Object *obj)
>  static Property vfio_pci_dev_properties[] = {
>  DEFINE_PROP_PCI_HOST_DEVADDR("host", VFIOPCIDevice, host),
>  DEFINE_PROP_STRING("sysfsdev", VFIOPCIDevice, vbasedev.sysfsdev),
> +DEFINE_PROP_ON_OFF_AUTO("display", VFIOPCIDevice,
> +display, ON_OFF_AUTO_AUTO),
>  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/Makefile.objs b/hw/vfio/Makefile.objs
> index c3ab9097f1..a2e7a0a7cf 100644
> --- a/hw/vfio/Makefile.objs
> +++ b/hw/vfio/Makefile.objs
> @@ -1,6 +1,6 @@
>  ifeq ($(CONFIG_LINUX), y)
>  obj-$(CONFIG_SOFTMMU) += common.o
> -obj-$(CONFIG_PCI) += pci.o pci-quirks.o
> +obj-$(CONFIG_PCI) += pci.o pci-quirks.o display.o
>  obj-$(CONFIG_VFIO_CCW) += ccw.o
>  obj-$(CONFIG_SOFTMMU) += platform.o
>  obj-$(CONFIG_VFIO_XGMAC) += calxeda-xgmac.o
>

[Qemu-devel] [PATCH v8 7/9] vfio/display: core & wireup

2018-03-06 Thread Gerd Hoffmann

Infrastructure for display support.  Must be enabled
using 'display' property.

Signed-off-by: Gerd Hoffmann 
---
 hw/vfio/pci.h |  4 
 hw/vfio/display.c | 56 +++
 hw/vfio/pci.c | 10 +
 hw/vfio/Makefile.objs |  2 +-
 4 files changed, 71 insertions(+), 1 deletion(-)
 create mode 100644 hw/vfio/display.c

diff --git a/hw/vfio/pci.h b/hw/vfio/pci.h
index f4aa13e021..a846cf6237 100644
--- a/hw/vfio/pci.h
+++ b/hw/vfio/pci.h
@@ -133,6 +133,7 @@ typedef struct VFIOPCIDevice {
 #define VFIO_FEATURE_ENABLE_IGD_OPREGION_BIT 2
 #define VFIO_FEATURE_ENABLE_IGD_OPREGION \
 (1 << VFIO_FEATURE_ENABLE_IGD_OPREGION_BIT)
+OnOffAuto display;
 int32_t bootindex;
 uint32_t igd_gms;
 OffAutoPCIBAR msix_relo;
@@ -174,4 +175,7 @@ int vfio_pci_igd_opregion_init(VFIOPCIDevice *vdev,
struct vfio_region_info *info,
Error **errp);
 
+int vfio_display_probe(VFIOPCIDevice *vdev, Error **errp);
+void vfio_display_finalize(VFIOPCIDevice *vdev);
+
 #endif /* HW_VFIO_VFIO_PCI_H */
diff --git a/hw/vfio/display.c b/hw/vfio/display.c
new file mode 100644
index 00..3e997f8a44
--- /dev/null
+++ b/hw/vfio/display.c
@@ -0,0 +1,56 @@
+/*
+ * display support for mdev based vgpu devices
+ *
+ * Copyright Red Hat, Inc. 2017
+ *
+ * Authors:
+ *Gerd Hoffmann
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2.  See
+ * the COPYING file in the top-level directory.
+ */
+
+#include "qemu/osdep.h"
+#include 
+#include 
+
+#include "sysemu/sysemu.h"
+#include "ui/console.h"
+#include "qapi/error.h"
+#include "pci.h"
+
+int vfio_display_probe(VFIOPCIDevice *vdev, Error **errp)
+{
+struct vfio_device_gfx_plane_info probe;
+int ret;
+
+memset(, 0, sizeof(probe));
+probe.argsz = sizeof(probe);
+probe.flags = VFIO_GFX_PLANE_TYPE_PROBE | VFIO_GFX_PLANE_TYPE_DMABUF;
+ret = ioctl(vdev->vbasedev.fd, VFIO_DEVICE_QUERY_GFX_PLANE, );
+if (ret == 0) {
+error_setg(errp, "vfio-display: dmabuf support not implemented yet");
+return -1;
+}
+
+memset(, 0, sizeof(probe));
+probe.argsz = sizeof(probe);
+probe.flags = VFIO_GFX_PLANE_TYPE_PROBE | VFIO_GFX_PLANE_TYPE_REGION;
+ret = ioctl(vdev->vbasedev.fd, VFIO_DEVICE_QUERY_GFX_PLANE, );
+if (ret == 0) {
+error_setg(errp, "vfio-display: region support not implemented yet");
+return -1;
+}
+
+if (vdev->display == ON_OFF_AUTO_AUTO) {
+/* not an error in automatic mode */
+return 0;
+}
+
+error_setg(errp, "vfio: device doesn't support any (known) display 
method");
+return -1;
+}
+
+void vfio_display_finalize(VFIOPCIDevice *vdev)
+{
+}
diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c
index 033cc8dea1..20f93bef74 100644
--- a/hw/vfio/pci.c
+++ b/hw/vfio/pci.c
@@ -3015,6 +3015,13 @@ static void vfio_realize(PCIDevice *pdev, Error **errp)
 }
 }
 
+if (vdev->display != ON_OFF_AUTO_OFF) {
+ret = vfio_display_probe(vdev, errp);
+if (ret) {
+goto out_teardown;
+}
+}
+
 vfio_register_err_notifier(vdev);
 vfio_register_req_notifier(vdev);
 vfio_setup_resetfn_quirk(vdev);
@@ -3035,6 +3042,7 @@ static void vfio_instance_finalize(Object *obj)
 VFIOPCIDevice *vdev = DO_UPCAST(VFIOPCIDevice, pdev, pci_dev);
 VFIOGroup *group = vdev->vbasedev.group;
 
+vfio_display_finalize(vdev);
 vfio_bars_finalize(vdev);
 g_free(vdev->emulated_config_bits);
 g_free(vdev->rom);
@@ -3123,6 +3131,8 @@ static void vfio_instance_init(Object *obj)
 static Property vfio_pci_dev_properties[] = {
 DEFINE_PROP_PCI_HOST_DEVADDR("host", VFIOPCIDevice, host),
 DEFINE_PROP_STRING("sysfsdev", VFIOPCIDevice, vbasedev.sysfsdev),
+DEFINE_PROP_ON_OFF_AUTO("display", VFIOPCIDevice,
+display, ON_OFF_AUTO_AUTO),
 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/Makefile.objs b/hw/vfio/Makefile.objs
index c3ab9097f1..a2e7a0a7cf 100644
--- a/hw/vfio/Makefile.objs
+++ b/hw/vfio/Makefile.objs
@@ -1,6 +1,6 @@
 ifeq ($(CONFIG_LINUX), y)
 obj-$(CONFIG_SOFTMMU) += common.o
-obj-$(CONFIG_PCI) += pci.o pci-quirks.o
+obj-$(CONFIG_PCI) += pci.o pci-quirks.o display.o
 obj-$(CONFIG_VFIO_CCW) += ccw.o
 obj-$(CONFIG_SOFTMMU) += platform.o
 obj-$(CONFIG_VFIO_XGMAC) += calxeda-xgmac.o
-- 
2.9.3

Re: [Qemu-devel] [PATCH v8 7/9] vfio/display: core & wireup

[Qemu-devel] [PATCH v8 7/9] vfio/display: core & wireup

2 matches

Site Navigation

Mail list logo

Footer information