[PATCH 1/4] drm/i915: No-Op enter/leave vt gem ioctl

[PATCH 1/4] drm/i915: No-Op enter/leave vt gem ioctl

[Daniel Vetter]

We've killed ums support by now, it's time to reap the benefits. This
one here is getting in the way of doing some ring init cleanup.

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
---
 drivers/gpu/drm/i915/i915_dma.c |  4 +--
 drivers/gpu/drm/i915/i915_drv.h |  4 ---
 drivers/gpu/drm/i915/i915_gem.c | 55 -----------------------------------------
 3 files changed, 2 insertions(+), 61 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
index 56f62112411a..dba79197bf96 100644
--- a/drivers/gpu/drm/i915/i915_dma.c
+++ b/drivers/gpu/drm/i915/i915_dma.c
@@ -2017,8 +2017,8 @@ const struct drm_ioctl_desc i915_ioctls[] = {
 	DRM_IOCTL_DEF_DRV(I915_GEM_SET_CACHING, i915_gem_set_caching_ioctl, DRM_UNLOCKED|DRM_RENDER_ALLOW),
 	DRM_IOCTL_DEF_DRV(I915_GEM_GET_CACHING, i915_gem_get_caching_ioctl, DRM_UNLOCKED|DRM_RENDER_ALLOW),
 	DRM_IOCTL_DEF_DRV(I915_GEM_THROTTLE, i915_gem_throttle_ioctl, DRM_AUTH|DRM_UNLOCKED|DRM_RENDER_ALLOW),
-	DRM_IOCTL_DEF_DRV(I915_GEM_ENTERVT, i915_gem_entervt_ioctl, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY|DRM_UNLOCKED),
-	DRM_IOCTL_DEF_DRV(I915_GEM_LEAVEVT, i915_gem_leavevt_ioctl, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY|DRM_UNLOCKED),
+	DRM_IOCTL_DEF_DRV(I915_GEM_ENTERVT, drm_noop, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY|DRM_UNLOCKED),
+	DRM_IOCTL_DEF_DRV(I915_GEM_LEAVEVT, drm_noop, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY|DRM_UNLOCKED),
 	DRM_IOCTL_DEF_DRV(I915_GEM_CREATE, i915_gem_create_ioctl, DRM_UNLOCKED|DRM_RENDER_ALLOW),
 	DRM_IOCTL_DEF_DRV(I915_GEM_PREAD, i915_gem_pread_ioctl, DRM_UNLOCKED|DRM_RENDER_ALLOW),
 	DRM_IOCTL_DEF_DRV(I915_GEM_PWRITE, i915_gem_pwrite_ioctl, DRM_UNLOCKED|DRM_RENDER_ALLOW),
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 1097d20a4f35..716bf7de18b5 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -2468,10 +2468,6 @@ int i915_gem_throttle_ioctl(struct drm_device *dev, void *data,
 			    struct drm_file *file_priv);
 int i915_gem_madvise_ioctl(struct drm_device *dev, void *data,
 			   struct drm_file *file_priv);
-int i915_gem_entervt_ioctl(struct drm_device *dev, void *data,
-			   struct drm_file *file_priv);
-int i915_gem_leavevt_ioctl(struct drm_device *dev, void *data,
-			   struct drm_file *file_priv);
 int i915_gem_set_tiling(struct drm_device *dev, void *data,
 			struct drm_file *file_priv);
 int i915_gem_get_tiling(struct drm_device *dev, void *data,
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 7f95d8ff28af..e61ba2b8c133 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -4980,61 +4980,6 @@ i915_gem_cleanup_ringbuffer(struct drm_device *dev)
 		dev_priv->gt.cleanup_ring(ring);
 }
 
-int
-i915_gem_entervt_ioctl(struct drm_device *dev, void *data,
-		       struct drm_file *file_priv)
-{
-	struct drm_i915_private *dev_priv = dev->dev_private;
-	int ret;
-
-	if (drm_core_check_feature(dev, DRIVER_MODESET))
-		return 0;
-
-	if (i915_reset_in_progress(&dev_priv->gpu_error)) {
-		DRM_ERROR("Reenabling wedged hardware, good luck\n");
-		atomic_set(&dev_priv->gpu_error.reset_counter, 0);
-	}
-
-	mutex_lock(&dev->struct_mutex);
-	dev_priv->ums.mm_suspended = 0;
-
-	ret = i915_gem_init_hw(dev);
-	if (ret != 0) {
-		mutex_unlock(&dev->struct_mutex);
-		return ret;
-	}
-
-	BUG_ON(!list_empty(&dev_priv->gtt.base.active_list));
-
-	ret = drm_irq_install(dev, dev->pdev->irq);
-	if (ret)
-		goto cleanup_ringbuffer;
-	mutex_unlock(&dev->struct_mutex);
-
-	return 0;
-
-cleanup_ringbuffer:
-	i915_gem_cleanup_ringbuffer(dev);
-	dev_priv->ums.mm_suspended = 1;
-	mutex_unlock(&dev->struct_mutex);
-
-	return ret;
-}
-
-int
-i915_gem_leavevt_ioctl(struct drm_device *dev, void *data,
-		       struct drm_file *file_priv)
-{
-	if (drm_core_check_feature(dev, DRIVER_MODESET))
-		return 0;
-
-	mutex_lock(&dev->struct_mutex);
-	drm_irq_uninstall(dev);
-	mutex_unlock(&dev->struct_mutex);
-
-	return i915_gem_suspend(dev);
-}
-
 void
 i915_gem_lastclose(struct drm_device *dev)
 {
-- 
1.9.3

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

[PATCH 2/4] drm/i915: Ditch dev_priv->ums.mm_suspend

[Daniel Vetter]

Again just complicates gem init functions and makes a general mess out
of everything.

Good riddance!

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
---
 drivers/gpu/drm/i915/i915_dma.c            |  3 ---
 drivers/gpu/drm/i915/i915_drv.c            |  5 +----
 drivers/gpu/drm/i915/i915_drv.h            | 14 --------------
 drivers/gpu/drm/i915/i915_gem.c            | 21 ---------------------
 drivers/gpu/drm/i915/i915_gem_execbuffer.c |  6 ------
 5 files changed, 1 insertion(+), 48 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
index dba79197bf96..ebf39fb8cca3 100644
--- a/drivers/gpu/drm/i915/i915_dma.c
+++ b/drivers/gpu/drm/i915/i915_dma.c
@@ -1780,9 +1780,6 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
 			DRM_ERROR("failed to init modeset\n");
 			goto out_power_well;
 		}
-	} else {
-		/* Start out suspended in ums mode. */
-		dev_priv->ums.mm_suspended = 1;
 	}
 
 	i915_setup_sysfs(dev);
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 19558d61b032..c3e49e128885 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -852,10 +852,7 @@ int i915_reset(struct drm_device *dev)
 	 * was running at the time of the reset (i.e. we weren't VT
 	 * switched away).
 	 */
-	if (drm_core_check_feature(dev, DRIVER_MODESET) ||
-			!dev_priv->ums.mm_suspended) {
-		dev_priv->ums.mm_suspended = 0;
-
+	if (drm_core_check_feature(dev, DRIVER_MODESET)) {
 		/* Used to prevent gem_check_wedged returning -EAGAIN during gpu reset */
 		dev_priv->gpu_error.reload_in_reset = true;
 
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 716bf7de18b5..75d77b88f0ee 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -1140,18 +1140,6 @@ struct i915_dri1_state {
 	uint32_t counter;
 };
 
-struct i915_ums_state {
-	/**
-	 * Flag if the X Server, and thus DRM, is not currently in
-	 * control of the device.
-	 *
-	 * This is set between LeaveVT and EnterVT.  It needs to be
-	 * replaced with a semaphore.  It also needs to be
-	 * transitioned away from for kernel modesetting.
-	 */
-	int mm_suspended;
-};
-
 #define MAX_L3_SLICES 2
 struct intel_l3_parity {
 	u32 *remap_info[MAX_L3_SLICES];
@@ -1790,8 +1778,6 @@ struct drm_i915_private {
 	/* Old dri1 support infrastructure, beware the dragons ya fools entering
 	 * here! */
 	struct i915_dri1_state dri1;
-	/* Old ums support infrastructure, same warning applies. */
-	struct i915_ums_state ums;
 
 	/* Abstract the submission mechanism (legacy ringbuffer or execlists) away */
 	struct {
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index e61ba2b8c133..1b3a4bcb754f 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -2410,7 +2410,6 @@ int __i915_add_request(struct intel_engine_cs *ring,
 		       struct drm_i915_gem_object *obj,
 		       u32 *out_seqno)
 {
-	struct drm_i915_private *dev_priv = ring->dev->dev_private;
 	struct drm_i915_gem_request *request;
 	struct intel_ringbuffer *ringbuf;
 	u32 request_ring_position, request_start;
@@ -2501,16 +2500,6 @@ int __i915_add_request(struct intel_engine_cs *ring,
 	ring->outstanding_lazy_seqno = 0;
 	ring->preallocated_lazy_request = NULL;
 
-	if (!dev_priv->ums.mm_suspended) {
-		i915_queue_hangcheck(ring->dev);
-
-		cancel_delayed_work_sync(&dev_priv->mm.idle_work);
-		queue_delayed_work(dev_priv->wq,
-				   &dev_priv->mm.retire_work,
-				   round_jiffies_up_relative(HZ));
-		intel_mark_busy(dev_priv->dev);
-	}
-
 	if (out_seqno)
 		*out_seqno = request->seqno;
 	return 0;
@@ -4651,9 +4640,6 @@ i915_gem_suspend(struct drm_device *dev)
 	int ret = 0;
 
 	mutex_lock(&dev->struct_mutex);
-	if (dev_priv->ums.mm_suspended)
-		goto err;
-
 	ret = i915_gpu_idle(dev);
 	if (ret)
 		goto err;
@@ -4666,13 +4652,6 @@ i915_gem_suspend(struct drm_device *dev)
 
 	i915_kernel_lost_context(dev);
 	i915_gem_stop_ringbuffers(dev);
-
-	/* Hack!  Don't let anybody do execbuf while we don't control the chip.
-	 * We need to replace this with a semaphore, or something.
-	 * And not confound ums.mm_suspended!
-	 */
-	dev_priv->ums.mm_suspended = !drm_core_check_feature(dev,
-							     DRIVER_MODESET);
 	mutex_unlock(&dev->struct_mutex);
 
 	del_timer_sync(&dev_priv->gpu_error.hangcheck_timer);
diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
index e1ed85a6dc6d..41c3dca33625 100644
--- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c
+++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
@@ -1297,12 +1297,6 @@ i915_gem_do_execbuffer(struct drm_device *dev, void *data,
 	if (ret)
 		goto pre_mutex_err;
 
-	if (dev_priv->ums.mm_suspended) {
-		mutex_unlock(&dev->struct_mutex);
-		ret = -EBUSY;
-		goto pre_mutex_err;
-	}
-
 	ctx = i915_gem_validate_context(dev, file, ring, ctx_id);
 	if (IS_ERR(ctx)) {
 		mutex_unlock(&dev->struct_mutex);
-- 
1.9.3

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

[PATCH] drm/i915: Ditch dev_priv->ums.mm_suspend

[Daniel Vetter]

Again just complicates gem init functions and makes a general mess out
of everything.

Good riddance!

v2: In my enthusiasm to start removing dri1/ums crud I went overboard a
bit and killed parts of hangcheck. Resurrect it.

Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
---
 drivers/gpu/drm/i915/i915_dma.c            |  3 ---
 drivers/gpu/drm/i915/i915_drv.c            |  5 +----
 drivers/gpu/drm/i915/i915_drv.h            | 15 ---------------
 drivers/gpu/drm/i915/i915_gem.c            | 24 ++++++------------------
 drivers/gpu/drm/i915/i915_gem_execbuffer.c |  6 ------
 5 files changed, 7 insertions(+), 46 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
index 6c9625305abc..c20fa303365f 100644
--- a/drivers/gpu/drm/i915/i915_dma.c
+++ b/drivers/gpu/drm/i915/i915_dma.c
@@ -815,9 +815,6 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
 			DRM_ERROR("failed to init modeset\n");
 			goto out_power_well;
 		}
-	} else {
-		/* Start out suspended in ums mode. */
-		dev_priv->ums.mm_suspended = 1;
 	}
 
 	i915_setup_sysfs(dev);
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index c9f248acbd69..1df407941700 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -852,10 +852,7 @@ int i915_reset(struct drm_device *dev)
 	 * was running at the time of the reset (i.e. we weren't VT
 	 * switched away).
 	 */
-	if (drm_core_check_feature(dev, DRIVER_MODESET) ||
-			!dev_priv->ums.mm_suspended) {
-		dev_priv->ums.mm_suspended = 0;
-
+	if (drm_core_check_feature(dev, DRIVER_MODESET)) {
 		/* Used to prevent gem_check_wedged returning -EAGAIN during gpu reset */
 		dev_priv->gpu_error.reload_in_reset = true;
 
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index a52fba103ce9..3d572a6023e6 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -1121,18 +1121,6 @@ struct i915_power_domains {
 	struct i915_power_well *power_wells;
 };
 
-struct i915_ums_state {
-	/**
-	 * Flag if the X Server, and thus DRM, is not currently in
-	 * control of the device.
-	 *
-	 * This is set between LeaveVT and EnterVT.  It needs to be
-	 * replaced with a semaphore.  It also needs to be
-	 * transitioned away from for kernel modesetting.
-	 */
-	int mm_suspended;
-};
-
 #define MAX_L3_SLICES 2
 struct intel_l3_parity {
 	u32 *remap_info[MAX_L3_SLICES];
@@ -1768,9 +1756,6 @@ struct drm_i915_private {
 
 	uint32_t bios_vgacntr;
 
-	/* Old ums support infrastructure, same warning applies. */
-	struct i915_ums_state ums;
-
 	/* Abstract the submission mechanism (legacy ringbuffer or execlists) away */
 	struct {
 		int (*do_execbuf)(struct drm_device *dev, struct drm_file *file,
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index bd171092e86f..af30283db628 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -2501,15 +2501,13 @@ int __i915_add_request(struct intel_engine_cs *ring,
 	ring->outstanding_lazy_seqno = 0;
 	ring->preallocated_lazy_request = NULL;
 
-	if (!dev_priv->ums.mm_suspended) {
-		i915_queue_hangcheck(ring->dev);
+	i915_queue_hangcheck(ring->dev);
 
-		cancel_delayed_work_sync(&dev_priv->mm.idle_work);
-		queue_delayed_work(dev_priv->wq,
-				   &dev_priv->mm.retire_work,
-				   round_jiffies_up_relative(HZ));
-		intel_mark_busy(dev_priv->dev);
-	}
+	cancel_delayed_work_sync(&dev_priv->mm.idle_work);
+	queue_delayed_work(dev_priv->wq,
+			   &dev_priv->mm.retire_work,
+			   round_jiffies_up_relative(HZ));
+	intel_mark_busy(dev_priv->dev);
 
 	if (out_seqno)
 		*out_seqno = request->seqno;
@@ -4651,9 +4649,6 @@ i915_gem_suspend(struct drm_device *dev)
 	int ret = 0;
 
 	mutex_lock(&dev->struct_mutex);
-	if (dev_priv->ums.mm_suspended)
-		goto err;
-
 	ret = i915_gpu_idle(dev);
 	if (ret)
 		goto err;
@@ -4665,13 +4660,6 @@ i915_gem_suspend(struct drm_device *dev)
 		i915_gem_evict_everything(dev);
 
 	i915_gem_stop_ringbuffers(dev);
-
-	/* Hack!  Don't let anybody do execbuf while we don't control the chip.
-	 * We need to replace this with a semaphore, or something.
-	 * And not confound ums.mm_suspended!
-	 */
-	dev_priv->ums.mm_suspended = !drm_core_check_feature(dev,
-							     DRIVER_MODESET);
 	mutex_unlock(&dev->struct_mutex);
 
 	del_timer_sync(&dev_priv->gpu_error.hangcheck_timer);
diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
index b16eee061990..11738316394a 100644
--- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c
+++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
@@ -1338,12 +1338,6 @@ i915_gem_do_execbuffer(struct drm_device *dev, void *data,
 	if (ret)
 		goto pre_mutex_err;
 
-	if (dev_priv->ums.mm_suspended) {
-		mutex_unlock(&dev->struct_mutex);
-		ret = -EBUSY;
-		goto pre_mutex_err;
-	}
-
 	ctx = i915_gem_validate_context(dev, file, ring, ctx_id);
 	if (IS_ERR(ctx)) {
 		mutex_unlock(&dev->struct_mutex);
-- 
2.1.1

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

[PATCH 3/4] drm/i915: Sanitize ->lastclose

[Daniel Vetter]

With this all the ums nonsense around gem setup/teardown has
disappeared, yay!

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
---
 drivers/gpu/drm/i915/i915_dma.c | 19 ++-----------------
 drivers/gpu/drm/i915/i915_drv.h |  1 -
 drivers/gpu/drm/i915/i915_gem.c | 13 -------------
 3 files changed, 2 insertions(+), 31 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
index ebf39fb8cca3..0921bb65ec9c 100644
--- a/drivers/gpu/drm/i915/i915_dma.c
+++ b/drivers/gpu/drm/i915/i915_dma.c
@@ -1948,23 +1948,8 @@ int i915_driver_open(struct drm_device *dev, struct drm_file *file)
  */
 void i915_driver_lastclose(struct drm_device *dev)
 {
-	struct drm_i915_private *dev_priv = dev->dev_private;
-
-	/* On gen6+ we refuse to init without kms enabled, but then the drm core
-	 * goes right around and calls lastclose. Check for this and don't clean
-	 * up anything. */
-	if (!dev_priv)
-		return;
-
-	if (drm_core_check_feature(dev, DRIVER_MODESET)) {
-		intel_fbdev_restore_mode(dev);
-		vga_switcheroo_process_delayed_switch();
-		return;
-	}
-
-	i915_gem_lastclose(dev);
-
-	i915_dma_cleanup(dev);
+	intel_fbdev_restore_mode(dev);
+	vga_switcheroo_process_delayed_switch();
 }
 
 void i915_driver_preclose(struct drm_device *dev, struct drm_file *file)
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 75d77b88f0ee..bbd842168b58 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -2496,7 +2496,6 @@ int __must_check i915_vma_unbind(struct i915_vma *vma);
 int i915_gem_object_put_pages(struct drm_i915_gem_object *obj);
 void i915_gem_release_all_mmaps(struct drm_i915_private *dev_priv);
 void i915_gem_release_mmap(struct drm_i915_gem_object *obj);
-void i915_gem_lastclose(struct drm_device *dev);
 
 int i915_gem_obj_prepare_shmem_read(struct drm_i915_gem_object *obj,
 				    int *needs_clflush);
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 1b3a4bcb754f..c40b0b1e2f39 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -4959,19 +4959,6 @@ i915_gem_cleanup_ringbuffer(struct drm_device *dev)
 		dev_priv->gt.cleanup_ring(ring);
 }
 
-void
-i915_gem_lastclose(struct drm_device *dev)
-{
-	int ret;
-
-	if (drm_core_check_feature(dev, DRIVER_MODESET))
-		return;
-
-	ret = i915_gem_suspend(dev);
-	if (ret)
-		DRM_ERROR("failed to idle hardware: %d\n", ret);
-}
-
 static void
 init_ring_lists(struct intel_engine_cs *ring)
 {
-- 
1.9.3

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

[PATCH 4/4] drm/i915: Kill intel_render_ring_init_dri

[Daniel Vetter]

The old dri1 code is dead and this ring init function seems to confuse
people badly. So let's remove it.

There's lots more (especially in i915_dma.c) which is dead code now,
but that can be ditched later on.

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
---
 drivers/gpu/drm/i915/i915_dma.c         |  9 ----
 drivers/gpu/drm/i915/intel_ringbuffer.c | 85 ---------------------------------
 drivers/gpu/drm/i915/intel_ringbuffer.h |  3 --
 3 files changed, 97 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
index 0921bb65ec9c..ea492654a62a 100644
--- a/drivers/gpu/drm/i915/i915_dma.c
+++ b/drivers/gpu/drm/i915/i915_dma.c
@@ -196,7 +196,6 @@ static int i915_initialize(struct drm_device *dev, drm_i915_init_t *init)
 {
 	struct drm_i915_private *dev_priv = dev->dev_private;
 	struct drm_i915_master_private *master_priv = dev->primary->master->driver_priv;
-	int ret;
 
 	master_priv->sarea = drm_legacy_getsarea(dev);
 	if (master_priv->sarea) {
@@ -213,14 +212,6 @@ static int i915_initialize(struct drm_device *dev, drm_i915_init_t *init)
 				  "GEM mode\n");
 			return -EINVAL;
 		}
-
-		ret = intel_render_ring_init_dri(dev,
-						 init->ring_start,
-						 init->ring_size);
-		if (ret) {
-			i915_dma_cleanup(dev);
-			return ret;
-		}
 	}
 
 	dev_priv->dri1.cpp = init->cpp;
diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c
index 0a4f35e735c3..6fd28b073faa 100644
--- a/drivers/gpu/drm/i915/intel_ringbuffer.c
+++ b/drivers/gpu/drm/i915/intel_ringbuffer.c
@@ -2455,91 +2455,6 @@ int intel_init_render_ring_buffer(struct drm_device *dev)
 	return intel_init_ring_buffer(dev, ring);
 }
 
-int intel_render_ring_init_dri(struct drm_device *dev, u64 start, u32 size)
-{
-	struct drm_i915_private *dev_priv = dev->dev_private;
-	struct intel_engine_cs *ring = &dev_priv->ring[RCS];
-	struct intel_ringbuffer *ringbuf = ring->buffer;
-	int ret;
-
-	if (ringbuf == NULL) {
-		ringbuf = kzalloc(sizeof(*ringbuf), GFP_KERNEL);
-		if (!ringbuf)
-			return -ENOMEM;
-		ring->buffer = ringbuf;
-	}
-
-	ring->name = "render ring";
-	ring->id = RCS;
-	ring->mmio_base = RENDER_RING_BASE;
-
-	if (INTEL_INFO(dev)->gen >= 6) {
-		/* non-kms not supported on gen6+ */
-		ret = -ENODEV;
-		goto err_ringbuf;
-	}
-
-	/* Note: gem is not supported on gen5/ilk without kms (the corresponding
-	 * gem_init ioctl returns with -ENODEV). Hence we do not need to set up
-	 * the special gen5 functions. */
-	ring->add_request = i9xx_add_request;
-	if (INTEL_INFO(dev)->gen < 4)
-		ring->flush = gen2_render_ring_flush;
-	else
-		ring->flush = gen4_render_ring_flush;
-	ring->get_seqno = ring_get_seqno;
-	ring->set_seqno = ring_set_seqno;
-	if (IS_GEN2(dev)) {
-		ring->irq_get = i8xx_ring_get_irq;
-		ring->irq_put = i8xx_ring_put_irq;
-	} else {
-		ring->irq_get = i9xx_ring_get_irq;
-		ring->irq_put = i9xx_ring_put_irq;
-	}
-	ring->irq_enable_mask = I915_USER_INTERRUPT;
-	ring->write_tail = ring_write_tail;
-	if (INTEL_INFO(dev)->gen >= 4)
-		ring->dispatch_execbuffer = i965_dispatch_execbuffer;
-	else if (IS_I830(dev) || IS_845G(dev))
-		ring->dispatch_execbuffer = i830_dispatch_execbuffer;
-	else
-		ring->dispatch_execbuffer = i915_dispatch_execbuffer;
-	ring->init = init_render_ring;
-	ring->cleanup = render_ring_cleanup;
-
-	ring->dev = dev;
-	INIT_LIST_HEAD(&ring->active_list);
-	INIT_LIST_HEAD(&ring->request_list);
-
-	ringbuf->size = size;
-	ringbuf->effective_size = ringbuf->size;
-	if (IS_I830(ring->dev) || IS_845G(ring->dev))
-		ringbuf->effective_size -= 2 * CACHELINE_BYTES;
-
-	ringbuf->virtual_start = ioremap_wc(start, size);
-	if (ringbuf->virtual_start == NULL) {
-		DRM_ERROR("can not ioremap virtual address for"
-			  " ring buffer\n");
-		ret = -ENOMEM;
-		goto err_ringbuf;
-	}
-
-	if (!I915_NEED_GFX_HWS(dev)) {
-		ret = init_phys_status_page(ring);
-		if (ret)
-			goto err_vstart;
-	}
-
-	return 0;
-
-err_vstart:
-	iounmap(ringbuf->virtual_start);
-err_ringbuf:
-	kfree(ringbuf);
-	ring->buffer = NULL;
-	return ret;
-}
-
 int intel_init_bsd_ring_buffer(struct drm_device *dev)
 {
 	struct drm_i915_private *dev_priv = dev->dev_private;
diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.h b/drivers/gpu/drm/i915/intel_ringbuffer.h
index 9eb3188595a6..fe426cff598b 100644
--- a/drivers/gpu/drm/i915/intel_ringbuffer.h
+++ b/drivers/gpu/drm/i915/intel_ringbuffer.h
@@ -448,7 +448,4 @@ static inline void i915_trace_irq_get(struct intel_engine_cs *ring, u32 seqno)
 		ring->trace_irq_seqno = seqno;
 }
 
-/* DRI warts */
-int intel_render_ring_init_dri(struct drm_device *dev, u64 start, u32 size);
-
 #endif /* _INTEL_RINGBUFFER_H_ */
-- 
1.9.3

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH 4/4] drm/i915: Kill intel_render_ring_init_dri

[shuang.he]

Tested-By: PRC QA PRTS (Patch Regression Test System Contact: shuang.he@intel.com)
-------------------------------------Summary-------------------------------------
Platform          Delta          drm-intel-nightly          Series Applied
PNV                 -2              369/369              367/369
ILK              +13-14              384/403              383/403
SNB                 -9              459/459              450/459
IVB                 -13              332/332              319/332
BYT                 -1              290/290              289/290
HSW                 -43              610/610              567/610
BDW                 -15              297/297              282/297
-------------------------------------Detailed-------------------------------------
Platform  Test                                drm-intel-nightly          Series Applied
PNV  igt_drv_hangman_error-state-capture-render      TIMEOUT(25, M25M7M23)PASS(4, M23)      TIMEOUT(1, M25)PASS(3, M25)
PNV  igt_drv_missed_irq_hang      TIMEOUT(27, M23M25M7)PASS(1, M23)      TIMEOUT(1, M25)PASS(3, M25)
ILK  igt_drv_hangman_error-state-basic      TIMEOUT(12, M37M26)PASS(4, M26)      TIMEOUT(1, M26)PASS(3, M26)
ILK  igt_drv_hangman_error-state-capture-bsd      TIMEOUT(2, M26M37)PASS(1, M26)      TIMEOUT(1, M26)PASS(3, M26)
ILK  igt_drv_hangman_error-state-capture-render      PASS(1, M26)      TIMEOUT(1, M26)PASS(3, M26)
ILK  igt_drv_missed_irq_hang      PASS(1, M26)      TIMEOUT(1, M26)PASS(3, M26)
ILK  igt_gem_reset_stats_ban-render      PASS(4, M26)      TIMEOUT(1, M26)PASS(3, M26)
ILK  igt_gem_reset_stats_close-pending-fork-render      PASS(1, M26)      TIMEOUT(1, M26)PASS(3, M26)
ILK  igt_gem_reset_stats_close-pending-fork-reverse-render      PASS(1, M26)      TIMEOUT(1, M26)PASS(3, M26)
ILK  igt_gem_reset_stats_close-pending-render      PASS(1, M26)      TIMEOUT(1, M26)PASS(3, M26)
ILK  igt_gem_reset_stats_reset-count-render      PASS(1, M26)      TIMEOUT(1, M26)PASS(3, M26)
ILK  igt_gem_reset_stats_reset-stats-render      PASS(1, M26)      TIMEOUT(1, M26)PASS(3, M26)
ILK  igt_gem_workarounds_reset      PASS(1, M26)      TIMEOUT(1, M26)PASS(3, M26)
ILK  igt_kms_flip_bcs-wf_vblank-vs-modeset-interruptible      DMESG_WARN(1, M26)PASS(3, M26)      PASS(4, M26)
ILK  igt_kms_flip_blocking-wf_vblank      DMESG_WARN(1, M26)PASS(3, M26)      PASS(4, M26)
ILK  igt_kms_flip_flip-vs-absolute-wf_vblank      DMESG_WARN(1, M26)      PASS(4, M26)
ILK  igt_kms_flip_flip-vs-absolute-wf_vblank-interruptible      DMESG_WARN(1, M26)PASS(3, M26)      PASS(4, M26)
ILK  igt_kms_flip_flip-vs-dpms-off-vs-modeset-interruptible      DMESG_WARN(2, M26)PASS(2, M26)      DMESG_WARN(1, M26)PASS(3, M26)
ILK  igt_kms_flip_flip-vs-expired-vblank-interruptible      DMESG_WARN(2, M26)PASS(2, M26)      PASS(4, M26)
ILK  igt_kms_flip_flip-vs-modeset-vs-hang      DMESG_WARN(2, M26)PASS(2, M26)      TIMEOUT(1, M26)PASS(3, M26)
ILK  igt_kms_flip_flip-vs-modeset-vs-hang-interruptible      DMESG_WARN(1, M26)PASS(3, M26)      DMESG_WARN(1, M26)TIMEOUT(1, M26)PASS(2, M26)
ILK  igt_kms_flip_flip-vs-panning      NSPT(1, M26)      DMESG_WARN(2, M26)PASS(2, M26)
ILK  igt_kms_flip_flip-vs-panning-vs-hang-interruptible      DMESG_WARN(1, M26)PASS(3, M26)      TIMEOUT(1, M26)PASS(3, M26)
ILK  igt_kms_flip_flip-vs-wf_vblank      DMESG_WARN(1, M26)PASS(3, M26)      DMESG_WARN(1, M26)PASS(3, M26)
ILK  igt_kms_flip_nonexisting-fb      DMESG_WARN(1, M26)      PASS(4, M26)
ILK  igt_kms_flip_nonexisting-fb-interruptible      DMESG_WARN(1, M26)PASS(3, M26)      PASS(4, M26)
ILK  igt_kms_flip_plain-flip-interruptible      DMESG_WARN(1, M26)PASS(3, M26)      PASS(4, M26)
ILK  igt_kms_flip_plain-flip-ts-check-interruptible      PASS(1, M26)      DMESG_WARN(1, M26)PASS(3, M26)
ILK  igt_kms_flip_single-buffer-flip-vs-dpms-off-vs-modeset      DMESG_WARN(1, M26)      DMESG_WARN(1, M26)PASS(3, M26)
ILK  igt_kms_flip_vblank-vs-hang      PASS(1, M26)      TIMEOUT(1, M26)PASS(3, M26)
ILK  igt_kms_flip_vblank-vs-hang-interruptible      PASS(1, M26)      TIMEOUT(1, M26)PASS(3, M26)
ILK  igt_kms_flip_wf_vblank-interruptible      DMESG_WARN(1, M26)      PASS(4, M26)
ILK  igt_kms_flip_wf_vblank-vs-dpms      DMESG_WARN(1, M26)      PASS(4, M26)
SNB  igt_drv_hangman_error-state-basic      TIMEOUT(21, M35M22)PASS(1, M35)      TIMEOUT(1, M35)PASS(3, M35)
SNB  igt_drv_hangman_error-state-capture-bsd      TIMEOUT(21, M35M22)PASS(1, M35)      TIMEOUT(1, M35)PASS(3, M35)
SNB  igt_drv_hangman_error-state-capture-render      TIMEOUT(7, M35M22)PASS(1, M35)      TIMEOUT(1, M35)PASS(3, M35)
SNB  igt_drv_missed_irq_hang      PASS(1, M35)      TIMEOUT(1, M35)PASS(3, M35)
SNB  igt_gem_reset_stats_reset-count-render      PASS(1, M35)      TIMEOUT(1, M35)PASS(3, M35)
SNB  igt_gem_reset_stats_unrelated-ctx-render      PASS(1, M35)      TIMEOUT(1, M35)PASS(3, M35)
SNB  igt_kms_pipe_crc_basic_hang-read-crc-pipe-A      PASS(4, M35)      TIMEOUT(1, M35)PASS(3, M35)
SNB  igt_kms_pipe_crc_basic_hang-read-crc-pipe-B      PASS(1, M35)      TIMEOUT(1, M35)PASS(3, M35)
SNB  igt_pm_rps_min-max-config-idle      PASS(1, M35)      FAIL(1, M35)PASS(3, M35)
IVB  igt_drv_hangman_error-state-basic      TIMEOUT(15, M34M21M4)PASS(4, M21)      TIMEOUT(1, M34)PASS(3, M34)
IVB  igt_drv_hangman_error-state-capture-blt      TIMEOUT(15, M34M21M4)PASS(1, M21)      TIMEOUT(1, M34)PASS(3, M34)
IVB  igt_drv_hangman_error-state-capture-bsd      TIMEOUT(1, M34)PASS(1, M21)      TIMEOUT(1, M34)PASS(3, M34)
IVB  igt_drv_hangman_error-state-capture-render      PASS(1, M21)      TIMEOUT(1, M34)PASS(3, M34)
IVB  igt_drv_missed_irq_hang      PASS(1, M21)      TIMEOUT(1, M34)PASS(3, M34)
IVB  igt_gem_bad_reloc_negative-reloc      PASS(1, M21)      NSPT(1, M34)PASS(3, M34)
IVB  igt_gem_reset_stats_ban-ctx-render      DMESG_WARN(2, M21)PASS(2, M21)      TIMEOUT(1, M34)PASS(3, M34)
IVB  igt_gem_reset_stats_ban-render      DMESG_WARN(2, M21)PASS(2, M21)      TIMEOUT(1, M34)PASS(3, M34)
IVB  igt_gem_reset_stats_close-pending-blt      PASS(1, M21)      TIMEOUT(1, M34)PASS(3, M34)
IVB  igt_gem_reset_stats_close-pending-bsd      PASS(1, M21)      TIMEOUT(1, M34)PASS(3, M34)
IVB  igt_gem_reset_stats_close-pending-ctx-render      PASS(1, M21)      TIMEOUT(1, M34)PASS(3, M34)
IVB  igt_gem_reset_stats_close-pending-fork-blt      PASS(1, M21)      TIMEOUT(1, M34)PASS(3, M34)
IVB  igt_gem_reset_stats_close-pending-fork-bsd      PASS(1, M21)      TIMEOUT(1, M34)PASS(3, M34)
BYT  igt_drv_missed_irq_hang      TIMEOUT(32, M36M31)PASS(2, M36M31)      TIMEOUT(1, M36)
HSW  igt_drv_hangman_error-state-basic      TIMEOUT(6, M20M40)PASS(4, M19M40)      TIMEOUT(1, M40)PASS(3, M40)
HSW  igt_drv_hangman_error-state-capture-blt      TIMEOUT(4, M20M40)PASS(1, M19)      TIMEOUT(1, M40)PASS(3, M40)
HSW  igt_drv_hangman_error-state-capture-bsd      PASS(1, M19)      TIMEOUT(1, M40)PASS(3, M40)
HSW  igt_drv_hangman_error-state-capture-render      PASS(1, M19)      TIMEOUT(1, M40)PASS(3, M40)
HSW  igt_drv_hangman_error-state-capture-vebox      PASS(1, M19)      TIMEOUT(1, M40)PASS(3, M40)
HSW  igt_drv_missed_irq_hang      PASS(1, M19)      TIMEOUT(1, M40)PASS(3, M40)
HSW  igt_gem_reset_stats_ban-bsd      PASS(4, M19M40)      TIMEOUT(1, M40)PASS(3, M40)
HSW  igt_gem_reset_stats_ban-ctx-render      PASS(1, M19)      TIMEOUT(1, M40)PASS(3, M40)
HSW  igt_gem_reset_stats_ban-render      PASS(1, M19)      TIMEOUT(1, M40)PASS(3, M40)
HSW  igt_gem_reset_stats_ban-vebox      PASS(1, M19)      TIMEOUT(1, M40)PASS(3, M40)
HSW  igt_gem_reset_stats_close-pending-blt      PASS(1, M19)      TIMEOUT(1, M40)PASS(3, M40)
HSW  igt_gem_reset_stats_close-pending-bsd      PASS(1, M19)      TIMEOUT(1, M40)PASS(3, M40)
HSW  igt_gem_reset_stats_close-pending-ctx-render      PASS(1, M19)      TIMEOUT(1, M40)PASS(3, M40)
HSW  igt_gem_reset_stats_close-pending-fork-blt      PASS(1, M19)      TIMEOUT(1, M40)PASS(3, M40)
HSW  igt_gem_reset_stats_close-pending-fork-bsd      PASS(1, M19)      TIMEOUT(1, M40)PASS(3, M40)
HSW  igt_gem_reset_stats_close-pending-fork-render      PASS(1, M19)      TIMEOUT(1, M40)PASS(3, M40)
HSW  igt_gem_reset_stats_close-pending-fork-reverse-blt      PASS(1, M19)      TIMEOUT(1, M40)PASS(3, M40)
HSW  igt_gem_reset_stats_close-pending-fork-reverse-bsd      PASS(1, M19)      TIMEOUT(1, M40)PASS(3, M40)
HSW  igt_gem_reset_stats_close-pending-fork-reverse-render      PASS(1, M19)      TIMEOUT(1, M40)PASS(3, M40)
HSW  igt_gem_reset_stats_close-pending-fork-reverse-vebox      PASS(1, M19)      TIMEOUT(1, M40)PASS(3, M40)
HSW  igt_gem_reset_stats_close-pending-render      PASS(1, M19)      TIMEOUT(1, M40)PASS(3, M40)
HSW  igt_gem_reset_stats_close-pending-vebox      PASS(1, M19)      TIMEOUT(1, M40)PASS(3, M40)
HSW  igt_gem_reset_stats_reset-count-blt      PASS(1, M19)      TIMEOUT(1, M40)PASS(3, M40)
HSW  igt_gem_reset_stats_reset-count-bsd      PASS(1, M19)      TIMEOUT(1, M40)PASS(3, M40)
HSW  igt_gem_reset_stats_reset-count-ctx-render      PASS(1, M19)      TIMEOUT(1, M40)PASS(3, M40)
HSW  igt_gem_reset_stats_reset-count-render      PASS(1, M19)      TIMEOUT(1, M40)PASS(3, M40)
HSW  igt_gem_reset_stats_reset-count-vebox      PASS(1, M19)      TIMEOUT(1, M40)PASS(3, M40)
HSW  igt_gem_reset_stats_reset-stats-blt      PASS(1, M19)      TIMEOUT(1, M40)PASS(3, M40)
HSW  igt_gem_reset_stats_reset-stats-bsd      PASS(1, M19)      TIMEOUT(1, M40)PASS(3, M40)
HSW  igt_gem_reset_stats_reset-stats-ctx-render      PASS(1, M19)      TIMEOUT(1, M40)PASS(3, M40)
HSW  igt_gem_reset_stats_reset-stats-render      PASS(1, M19)      TIMEOUT(1, M40)PASS(3, M40)
HSW  igt_gem_reset_stats_reset-stats-vebox      PASS(1, M19)      TIMEOUT(1, M40)PASS(3, M40)
HSW  igt_gem_workarounds_reset      PASS(4, M19M40)      TIMEOUT(1, M40)PASS(3, M40)
HSW  igt_kms_flip_flip-vs-modeset-vs-hang      PASS(1, M19)      TIMEOUT(1, M40)PASS(3, M40)
HSW  igt_kms_flip_flip-vs-modeset-vs-hang-interruptible      PASS(1, M19)      TIMEOUT(1, M40)PASS(3, M40)
HSW  igt_kms_flip_flip-vs-panning-vs-hang      PASS(1, M19)      TIMEOUT(1, M40)PASS(3, M40)
HSW  igt_kms_flip_flip-vs-panning-vs-hang-interruptible      PASS(1, M19)      TIMEOUT(1, M40)PASS(3, M40)
HSW  igt_kms_flip_vblank-vs-hang      PASS(1, M19)      TIMEOUT(1, M40)PASS(3, M40)
HSW  igt_kms_flip_vblank-vs-hang-interruptible      PASS(1, M19)      TIMEOUT(1, M40)PASS(3, M40)
HSW  igt_kms_pipe_crc_basic_hang-read-crc-pipe-A      PASS(1, M19)      TIMEOUT(1, M40)PASS(3, M40)
HSW  igt_kms_pipe_crc_basic_hang-read-crc-pipe-B      PASS(1, M19)      TIMEOUT(1, M40)PASS(3, M40)
HSW  igt_kms_pipe_crc_basic_hang-read-crc-pipe-C      PASS(1, M19)      TIMEOUT(1, M40)PASS(3, M40)
HSW  igt_pm_rps_min-max-config-idle      PASS(4, M19M40)      FAIL(1, M40)PASS(3, M40)
BDW  igt_drv_hangman_error-state-basic      TIMEOUT(12, M28M30)PASS(4, M28M30)      TIMEOUT(1, M28)PASS(3, M28)
BDW  igt_drv_hangman_error-state-capture-blt      TIMEOUT(11, M28M30)PASS(1, M28)      TIMEOUT(1, M28)PASS(3, M28)
BDW  igt_drv_hangman_error-state-capture-bsd      TIMEOUT(1, M28)PASS(1, M28)      TIMEOUT(1, M28)PASS(3, M28)
BDW  igt_drv_hangman_error-state-capture-render      PASS(1, M28)      TIMEOUT(1, M28)PASS(3, M28)
BDW  igt_drv_hangman_error-state-capture-vebox      PASS(1, M28)      TIMEOUT(1, M28)PASS(3, M28)
BDW  igt_gem_reset_stats_ban-blt      PASS(1, M28)      TIMEOUT(1, M28)PASS(3, M28)
BDW  igt_gem_reset_stats_ban-bsd      PASS(1, M28)      TIMEOUT(1, M28)PASS(3, M28)
BDW  igt_gem_reset_stats_ban-ctx-render      PASS(1, M28)      TIMEOUT(1, M28)PASS(3, M28)
BDW  igt_gem_reset_stats_ban-render      PASS(1, M28)      TIMEOUT(1, M28)PASS(3, M28)
BDW  igt_gem_reset_stats_ban-vebox      PASS(1, M28)      TIMEOUT(1, M28)PASS(3, M28)
BDW  igt_gem_reset_stats_close-pending-blt      PASS(1, M28)      TIMEOUT(1, M28)PASS(3, M28)
BDW  igt_gem_reset_stats_close-pending-bsd      PASS(1, M28)      TIMEOUT(1, M28)PASS(3, M28)
BDW  igt_gem_reset_stats_close-pending-ctx-render      PASS(1, M28)      TIMEOUT(1, M28)PASS(3, M28)
BDW  igt_gem_reset_stats_close-pending-fork-blt      PASS(1, M28)      TIMEOUT(1, M28)PASS(3, M28)
BDW  igt_gem_reset_stats_close-pending-fork-bsd      PASS(1, M28)      TIMEOUT(1, M28)PASS(3, M28)
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH 1/4] drm/i915: No-Op enter/leave vt gem ioctl

[Chris Wilson]

On Wed, Nov 19, 2014 at 08:36:47PM +0100, Daniel Vetter wrote:
> We've killed ums support by now, it's time to reap the benefits. This
> one here is getting in the way of doing some ring init cleanup.
> 
> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>

1-3 seem reasonable and we've established that no one cried out for UMS
in the last and pending kernel release, so

Acked-by: Chris Wilson <chris@chris-wilson.co.uk>

Patch 4 seems incomplete. You remove one part of the DRI1 implmentation,
but I don't see how that prevents the DRI1 ioctls then promptly blowing
up instead of reporting an error back to the user.
-Chris

-- 
Chris Wilson, Intel Open Source Technology Centre
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx