From da738d1ed0a0941a0cd061395ad86072171b3242 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Fri, 8 Nov 2013 16:40:18 +1000
Subject: Revert "intel: Add support for GPU reset status query ioctl"

This reverts commit 6335e1d28c422050024bcf4100c4fb3a5bac2afb.

No taxation without representation, in other words no userspace without kernel
stuff being in a stable location, either drm-next but I'll accept drm-intel-next
for intel specific stuff.
---
 intel/intel_bufmgr.h     |  5 -----
 intel/intel_bufmgr_gem.c | 34 ----------------------------------
 2 files changed, 39 deletions(-)

(limited to 'intel')

diff --git a/intel/intel_bufmgr.h b/intel/intel_bufmgr.h
index 2eb9742b..15f818e7 100644
--- a/intel/intel_bufmgr.h
+++ b/intel/intel_bufmgr.h
@@ -248,11 +248,6 @@ int drm_intel_reg_read(drm_intel_bufmgr *bufmgr,
 		       uint32_t offset,
 		       uint64_t *result);
 
-int drm_intel_get_reset_stats(drm_intel_context *ctx,
-			      uint32_t *reset_count,
-			      uint32_t *active,
-			      uint32_t *pending);
-
 /** @{ Compatibility defines to keep old code building despite the symbol rename
  * from dri_* to drm_intel_*
  */
diff --git a/intel/intel_bufmgr_gem.c b/intel/intel_bufmgr_gem.c
index df6fcec4..029ca5d8 100644
--- a/intel/intel_bufmgr_gem.c
+++ b/intel/intel_bufmgr_gem.c
@@ -3020,40 +3020,6 @@ drm_intel_gem_context_destroy(drm_intel_context *ctx)
 	free(ctx);
 }
 
-int
-drm_intel_get_reset_stats(drm_intel_context *ctx,
-			  uint32_t *reset_count,
-			  uint32_t *active,
-			  uint32_t *pending)
-{
-	drm_intel_bufmgr_gem *bufmgr_gem;
-	struct drm_i915_reset_stats stats;
-	int ret;
-
-	if (ctx == NULL)
-		return -EINVAL;
-
-	VG_CLEAR(stats);
-
-	bufmgr_gem = (drm_intel_bufmgr_gem *)ctx->bufmgr;
-	stats.ctx_id = ctx->ctx_id;
-	ret = drmIoctl(bufmgr_gem->fd,
-		       DRM_IOCTL_I915_GET_RESET_STATS,
-		       &stats);
-	if (ret == 0) {
-		if (reset_count != NULL)
-			*reset_count = stats.reset_count;
-
-		if (active != NULL)
-			*active = stats.batch_active;
-
-		if (pending != NULL)
-			*pending = stats.batch_pending;
-	}
-
-	return ret;
-}
-
 int
 drm_intel_reg_read(drm_intel_bufmgr *bufmgr,
 		   uint32_t offset,
-- 
cgit v1.2.3