Merge commit 'origin/drm-gem' into modesetting-gem

Use new GEM based ring buffer initialization.  Still need to init GEM & use it
for framebuffer allocation etc.

Conflicts:

	shared-core/i915_dma.c
	shared-core/i915_drv.h

1 files changed, 4 insertions, 7 deletions

diff --git a/shared-core/i915_dma.c b/shared-core/i915_dma.c
index 86881ab8..1e51e702 100644
--- a/shared-core/i915_dma.c
+++ b/shared-core/i915_dma.c
@@ -232,20 +232,16 @@ static int i915_initialize(struct drm_device * dev,
 	}
 #endif
 
-	if (!dev_priv->ring.Size) {
-		dev_priv->ring.Start = init->ring_start;
-		dev_priv->ring.End = init->ring_end;
+	if (init->ring_size != 0) {
 		dev_priv->ring.Size = init->ring_size;
 		dev_priv->ring.tail_mask = dev_priv->ring.Size - 1;
-		
 		dev_priv->ring.map.offset = init->ring_start;
 		dev_priv->ring.map.size = init->ring_size;
 		dev_priv->ring.map.type = 0;
 		dev_priv->ring.map.flags = 0;
 		dev_priv->ring.map.mtrr = 0;
-		
 		drm_core_ioremap(&dev_priv->ring.map, dev);
-		
+
 		if (dev_priv->ring.map.handle == NULL) {
 			i915_dma_cleanup(dev);
 			DRM_ERROR("can not ioremap virtual address for"
@@ -255,7 +251,6 @@ static int i915_initialize(struct drm_device * dev,
 		dev_priv->ring.virtual_start = dev_priv->ring.map.handle;
 	}
 
-
 	dev_priv->cpp = init->cpp;
 	master_priv->sarea_priv->pf_current_page = 0;
 
@@ -1091,6 +1086,8 @@ struct drm_ioctl_desc i915_ioctls[] = {
 	DRM_IOCTL_DEF(DRM_I915_GEM_UNPIN, i915_gem_unpin_ioctl, DRM_AUTH|DRM_ROOT_ONLY),
 	DRM_IOCTL_DEF(DRM_I915_GEM_BUSY, i915_gem_busy_ioctl, DRM_AUTH),
 	DRM_IOCTL_DEF(DRM_I915_GEM_THROTTLE, i915_gem_throttle_ioctl, DRM_AUTH),
+	DRM_IOCTL_DEF(DRM_I915_GEM_ENTERVT, i915_gem_entervt_ioctl, DRM_AUTH),
+	DRM_IOCTL_DEF(DRM_I915_GEM_LEAVEVT, i915_gem_leavevt_ioctl, DRM_AUTH),
 };
 
 int i915_max_ioctl = DRM_ARRAY_SIZE(i915_ioctls);