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

Yay, thanks to Gerd for pull this together.

* 'virtio-gpu-drm-next' of git://git.kraxel.org/linux:
  Add MAINTAINERS entry for virtio-gpu.
  Add virtio gpu driver.
  drm_vblank_get: don't WARN_ON in case vblanks are not initialized
  break kconfig dependency loop
This commit is contained in:
Dave Airlie 2015-06-04 09:36:39 +10:00
commit 63e1456122
25 changed files with 3601 additions and 1 deletions

View file

@ -818,6 +818,7 @@ struct drm_device {
#endif
struct platform_device *platformdev; /**< Platform device struture */
struct virtio_device *virtdev;
struct drm_sg_mem *sg; /**< Scatter gather memory */
unsigned int num_crtcs; /**< Number of CRTCs on this device */