aboutsummaryrefslogtreecommitdiff
path: root/include/drm
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2015-06-04 09:36:39 +1000
committerDave Airlie <airlied@redhat.com>2015-06-04 09:36:39 +1000
commit63e1456122761745082d325329ccce749a426059 (patch)
treeab23814f68ab4af1a45c7e9631561b2a1b01b430 /include/drm
parent6aa627250354c73ec705040b3a327b2915756fac (diff)
parent4ad6ee91aa9f730136eccc02dfc1df4ad56baa57 (diff)
downloadlinux-linaro-stable-63e1456122761745082d325329ccce749a426059.tar.gz
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
Diffstat (limited to 'include/drm')
-rw-r--r--include/drm/drmP.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/drm/drmP.h b/include/drm/drmP.h
index 9fa6366f47c2..48db6a56975f 100644
--- a/include/drm/drmP.h
+++ b/include/drm/drmP.h
@@ -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 */