Skip to contentSkip to conversation

qemu qxl kms driver

PATCH New Dave Airlie 1 participant 3 messages Mar 6, 2013

Subsystems (4)
lore
Share & tools
lore

Dave Airlie

author maintainer
#0 lore raw

Hi,

This is a KMS driver for the QXL virtual hw device shipped in qemu.

The first patch just adds some ttm symbol exports, the second contains the driver.

Its also in my git repo here
http://cgit.freedesktop.org/~airlied/linux/log/?h=qxl-upstream

The userspace driver is here
http://cgit.freedesktop.org/~airlied/xf86-video-qxl/log/?h=qxl-kms

There is also a header file addition to libdrm:
http://cgit.freedesktop.org/~airlied/drm/log/?h=qxl-kms
though I could probably drop it into the ddx at this point, since there isn't really any DRI usefulness on this hw yet. Though maybe we can save a copy or two in some fast paths.

Dave.

author maintainer
#1 lore raw

PATCH 1/2 ttm: export functions to allow qxl do its own iomapping

qxl wants to use io mapping like i915 gem does, for now just export the symbols so the driver can implement atomic page maps using io mapping.

---
 drivers/gpu/drm/ttm/ttm_bo_util.c | 13 +++++++++----
 include/drm/ttm/ttm_bo_driver.h   |  4 ++++
 2 files changed, 13 insertions(+), 4 deletions(-)
drivers/gpu/drm/ttm/ttm_bo_util.c +9 -4
index 44420fc..aaf6f47 100644
@@ -86,6 +86,7 @@ int ttm_mem_io_lock(struct ttm_mem_type_manager *man, bool interruptible)
 	mutex_lock(&man->io_reserve_mutex);
 	return 0;
 }
+EXPORT_SYMBOL(ttm_mem_io_lock);
 
 void ttm_mem_io_unlock(struct ttm_mem_type_manager *man)
 {
@@ -94,6 +95,7 @@ void ttm_mem_io_unlock(struct ttm_mem_type_manager *man)
 
 	mutex_unlock(&man->io_reserve_mutex);
 }
+EXPORT_SYMBOL(ttm_mem_io_unlock);
 
 static int ttm_mem_io_evict(struct ttm_mem_type_manager *man)
 {
@@ -111,8 +113,9 @@ static int ttm_mem_io_evict(struct ttm_mem_type_manager *man)
 	return 0;
 }
 
-static int ttm_mem_io_reserve(struct ttm_bo_device *bdev,
-			      struct ttm_mem_reg *mem)
+
+int ttm_mem_io_reserve(struct ttm_bo_device *bdev,
+		       struct ttm_mem_reg *mem)
 {
 	struct ttm_mem_type_manager *man = &bdev->man[mem->mem_type];
 	int ret = 0;
@@ -134,9 +137,10 @@ retry:
 	}
 	return ret;
 }
+EXPORT_SYMBOL(ttm_mem_io_reserve);
 
-static void ttm_mem_io_free(struct ttm_bo_device *bdev,
-			    struct ttm_mem_reg *mem)
+void ttm_mem_io_free(struct ttm_bo_device *bdev,
+		     struct ttm_mem_reg *mem)
 {
 	struct ttm_mem_type_manager *man = &bdev->man[mem->mem_type];
 
@@ -149,6 +153,7 @@ static void ttm_mem_io_free(struct ttm_bo_device *bdev,
 		bdev->driver->io_mem_free(bdev, mem);
 
 }
+EXPORT_SYMBOL(ttm_mem_io_free);
 
 int ttm_mem_io_reserve_vm(struct ttm_buffer_object *bo)
 {
include/drm/ttm/ttm_bo_driver.h +4 -0
index 0fbd046..9c8dca7 100644
@@ -902,6 +902,10 @@ extern void ttm_bo_unreserve_locked(struct ttm_buffer_object *bo);
  * ttm_bo_util.c
  */
 
+int ttm_mem_io_reserve(struct ttm_bo_device *bdev,
+		       struct ttm_mem_reg *mem);
+void ttm_mem_io_free(struct ttm_bo_device *bdev,
+		     struct ttm_mem_reg *mem);
 /**
  * ttm_bo_move_ttm
  *
Signature · 1 line
1.8.1.4
author maintainer
#2 lore raw

PATCH 2/2 drm: add new QXL driver.

In reply to Dave Airlie

QXL is a paravirtual graphics device used by the Spice virtual desktop interface.

The drivers uses GEM and TTM to manage memory, the qxl hw fencing however is quite different than normal TTM expects, we have to keep track of a number of non-linear fence ids per bo that we need to have released by the hardware.

The releases are freed from a workqueue that wakes up and processes the release ring.

releases are suballocated from a BO, there are 3 release categories, drawables, surfaces and cursor cmds. The hw also has 3 rings for commands, cursor and release handling.

The hardware also have a surface id tracking mechnaism and the driver encapsulates it completely inside the kernel, userspace never sees the actual hw surface ids.

This requires a newer version of the QXL userspace driver, so shouldn't be enabled until that has been placed into your distro of choice.

Authors: Dave Airlie, Alon Levy

---
 drivers/gpu/drm/Kconfig           |   2 +
 drivers/gpu/drm/Makefile          |   1 +
 drivers/gpu/drm/qxl/Kconfig       |  10 +
 drivers/gpu/drm/qxl/Makefile      |   9 +
 drivers/gpu/drm/qxl/qxl_cmd.c     | 711 +++++++++++++++++++++++++++
 drivers/gpu/drm/qxl/qxl_debugfs.c | 135 ++++++
 drivers/gpu/drm/qxl/qxl_dev.h     | 879 ++++++++++++++++++++++++++++++++++
 drivers/gpu/drm/qxl/qxl_display.c | 981 ++++++++++++++++++++++++++++++++++++++
 drivers/gpu/drm/qxl/qxl_draw.c    | 378 +++++++++++++++
 drivers/gpu/drm/qxl/qxl_drv.c     | 131 +++++
 drivers/gpu/drm/qxl/qxl_drv.h     | 566 ++++++++++++++++++++++
 drivers/gpu/drm/qxl/qxl_dumb.c    |  76 +++
 drivers/gpu/drm/qxl/qxl_fb.c      | 567 ++++++++++++++++++++++
 drivers/gpu/drm/qxl/qxl_fence.c   |  97 ++++
 drivers/gpu/drm/qxl/qxl_gem.c     | 178 +++++++
 drivers/gpu/drm/qxl/qxl_image.c   | 120 +++++
 drivers/gpu/drm/qxl/qxl_ioctl.c   | 411 ++++++++++++++++
 drivers/gpu/drm/qxl/qxl_irq.c     |  97 ++++
 drivers/gpu/drm/qxl/qxl_kms.c     | 300 ++++++++++++
 drivers/gpu/drm/qxl/qxl_object.c  | 365 ++++++++++++++
 drivers/gpu/drm/qxl/qxl_object.h  | 112 +++++
 drivers/gpu/drm/qxl/qxl_release.c | 307 ++++++++++++
 drivers/gpu/drm/qxl/qxl_ttm.c     | 580 ++++++++++++++++++++++
 include/uapi/drm/Kbuild           |   1 +
 include/uapi/drm/qxl_drm.h        | 151 ++++++
 25 files changed, 7165 insertions(+)
 create mode 100644 drivers/gpu/drm/qxl/Kconfig
 create mode 100644 drivers/gpu/drm/qxl/Makefile
 create mode 100644 drivers/gpu/drm/qxl/qxl_cmd.c
 create mode 100644 drivers/gpu/drm/qxl/qxl_debugfs.c
 create mode 100644 drivers/gpu/drm/qxl/qxl_dev.h
 create mode 100644 drivers/gpu/drm/qxl/qxl_display.c
 create mode 100644 drivers/gpu/drm/qxl/qxl_draw.c
 create mode 100644 drivers/gpu/drm/qxl/qxl_drv.c
 create mode 100644 drivers/gpu/drm/qxl/qxl_drv.h
 create mode 100644 drivers/gpu/drm/qxl/qxl_dumb.c
 create mode 100644 drivers/gpu/drm/qxl/qxl_fb.c
 create mode 100644 drivers/gpu/drm/qxl/qxl_fence.c
 create mode 100644 drivers/gpu/drm/qxl/qxl_gem.c
 create mode 100644 drivers/gpu/drm/qxl/qxl_image.c
 create mode 100644 drivers/gpu/drm/qxl/qxl_ioctl.c
 create mode 100644 drivers/gpu/drm/qxl/qxl_irq.c
 create mode 100644 drivers/gpu/drm/qxl/qxl_kms.c
 create mode 100644 drivers/gpu/drm/qxl/qxl_object.c
 create mode 100644 drivers/gpu/drm/qxl/qxl_object.h
 create mode 100644 drivers/gpu/drm/qxl/qxl_release.c
 create mode 100644 drivers/gpu/drm/qxl/qxl_ttm.c
 create mode 100644 include/uapi/drm/qxl_drm.h
drivers/gpu/drm/Kconfig +2 -0
index 1e82882..19b8e0d 100644
@@ -220,3 +220,5 @@ source "drivers/gpu/drm/tegra/Kconfig"
 source "drivers/gpu/drm/omapdrm/Kconfig"
 
 source "drivers/gpu/drm/tilcdc/Kconfig"
+
+source "drivers/gpu/drm/qxl/Kconfig"
drivers/gpu/drm/Makefile +1 -0
index 0d59b24..6a42115 100644
@@ -52,4 +52,5 @@ obj-$(CONFIG_DRM_SHMOBILE) +=shmobile/
 obj-$(CONFIG_DRM_TEGRA) += tegra/
 obj-$(CONFIG_DRM_OMAP)	+= omapdrm/
 obj-$(CONFIG_DRM_TILCDC)	+= tilcdc/
+obj-$(CONFIG_DRM_QXL) += qxl/
 obj-y			+= i2c/
drivers/gpu/drm/qxl/Kconfig new file +10 -0
new file mode 100644
index 0000000..2f1a57e
@@ -0,0 +1,10 @@
+config DRM_QXL
+	tristate "QXL virtual GPU"
+	depends on DRM && PCI
+	select FB_SYS_FILLRECT
+	select FB_SYS_COPYAREA
+	select FB_SYS_IMAGEBLIT
+        select DRM_KMS_HELPER
+        select DRM_TTM
+	help
+		QXL virtual GPU for Spice virtualization desktop integration. Do not enable this driver unless your distro ships a corresponding X.org QXL driver that can handle kernel modesetting.
drivers/gpu/drm/qxl/Makefile new file +9 -0
new file mode 100644
index 0000000..ea046ba
@@ -0,0 +1,9 @@
+#
+# Makefile for the drm device driver.  This driver provides support for the
+# Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher.
+
+ccflags-y := -Iinclude/drm
+
+qxl-y := qxl_drv.o qxl_kms.o qxl_display.o qxl_ttm.o qxl_fb.o qxl_object.o qxl_gem.o qxl_cmd.o qxl_image.o qxl_draw.o qxl_debugfs.o qxl_irq.o qxl_dumb.o qxl_ioctl.o qxl_fence.o qxl_release.o
+
+obj-$(CONFIG_DRM_QXL)+= qxl.o
drivers/gpu/drm/qxl/qxl_cmd.c new file +711 -0

711 lines not on this page · raw message

drivers/gpu/drm/qxl/qxl_debugfs.c new file +135 -0

135 lines not on this page · raw message

drivers/gpu/drm/qxl/qxl_dev.h new file +879 -0

879 lines not on this page · raw message

drivers/gpu/drm/qxl/qxl_display.c new file +981 -0

981 lines not on this page · raw message

drivers/gpu/drm/qxl/qxl_draw.c new file +378 -0

265 lines not on this page · raw message

drivers/gpu/drm/qxl/qxl_drv.c new file +131 -0

131 lines not on this page · raw message

drivers/gpu/drm/qxl/qxl_drv.h new file +566 -0

566 lines not on this page · raw message

drivers/gpu/drm/qxl/qxl_dumb.c new file +76 -0

76 lines not on this page · raw message

drivers/gpu/drm/qxl/qxl_fb.c new file +567 -0

567 lines not on this page · raw message

drivers/gpu/drm/qxl/qxl_fence.c new file +97 -0

97 lines not on this page · raw message

drivers/gpu/drm/qxl/qxl_gem.c new file +178 -0

178 lines not on this page · raw message

drivers/gpu/drm/qxl/qxl_image.c new file +120 -0

120 lines not on this page · raw message

drivers/gpu/drm/qxl/qxl_ioctl.c new file +411 -0

411 lines not on this page · raw message

drivers/gpu/drm/qxl/qxl_irq.c new file +97 -0

97 lines not on this page · raw message

drivers/gpu/drm/qxl/qxl_kms.c new file +300 -0

300 lines not on this page · raw message

drivers/gpu/drm/qxl/qxl_object.c new file +365 -0

365 lines not on this page · raw message

drivers/gpu/drm/qxl/qxl_object.h new file +112 -0

112 lines not on this page · raw message

drivers/gpu/drm/qxl/qxl_release.c new file +307 -0

307 lines not on this page · raw message

drivers/gpu/drm/qxl/qxl_ttm.c new file +580 -0

580 lines not on this page · raw message

include/uapi/drm/Kbuild +1 -0
index ba99ce3..a042a95 100644

Lines of this file are not shown. View the raw message.

include/uapi/drm/qxl_drm.h new file +151 -0

151 lines not on this page · raw message

The rest of this diff is not shown. View the raw message.

Signature · 6 lines
1.8.1.4

_______________________________________________
dri-devel mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/dri-devel

Part of the diff is not shown here. View the raw message.