Merge branch 'virtio-gpu-for-drm-next' of git://git.kraxel.org/linux into drm-next
authorDave Airlie <airlied@redhat.com>
Sun, 18 Oct 2015 21:16:15 +0000 (07:16 +1000)
committerDave Airlie <airlied@redhat.com>
Sun, 18 Oct 2015 21:16:15 +0000 (07:16 +1000)
commit3187567222178d4b3742e88242f7abb3c3b7a215
treef6c1621bcf85246d59f40a7b3b4ca29cfd4a9c5c
parentc76af02d90ee9e9d2ef478fc6f874ad2abcf3ec9
parentd24796a4a13a6c6a37b9e7145d36f983a27ad2e2
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