From: Dave Airlie <airlied@redhat.com>
Date: Sun, 18 Oct 2015 21:16:15 +0000 (+1000)
Subject: Merge branch 'virtio-gpu-for-drm-next' of git://git.kraxel.org/linux into drm-next
X-Git-Url: http://git.efficios.com/?a=commitdiff_plain;h=3187567222178d4b3742e88242f7abb3c3b7a215;p=deliverable%2Flinux.git

Merge branch 'virtio-gpu-for-drm-next' of git://git.kraxel.org/linux into drm-next

Add 3D support to the virtio-gpu.

* 'virtio-gpu-for-drm-next' of git://git.kraxel.org/linux:
  virtio-gpu: add page flip support
  virtio-gpu: mark as a render gpu
  virtio-gpu: add basic prime support
  virtio-gpu: add 3d/virgl support
  virtio-gpu: don't free things on ttm_bo_init failure
  virtio-gpu: wait for cursor updates finish
  virtio-gpu: add & use virtio_gpu_queue_fenced_ctrl_buffer
  virtio-gpu: add virtio_gpu_queue_ctrl_buffer_locked
---

3187567222178d4b3742e88242f7abb3c3b7a215