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.

diff --git a/include/drm/i915_drm.h b/include/drm/i915_drm.h
index 2703ded..aa983f3 100644 (file)
--- a/include/drm/i915_drm.h
+++ b/include/drm/i915_drm.h
@@ -198,7 +198,6 @@ typedef struct _drm_i915_sarea {
 #define DRM_I915_GEM_SET_CACHEING      0x2f
 #define DRM_I915_GEM_GET_CACHEING      0x30
 #define DRM_I915_REG_READ              0x31
-#define DRM_I915_GET_RESET_STATS       0x32
 
 #define DRM_IOCTL_I915_INIT            DRM_IOW( DRM_COMMAND_BASE + DRM_I915_INIT, drm_i915_init_t)
 #define DRM_IOCTL_I915_FLUSH           DRM_IO ( DRM_COMMAND_BASE + DRM_I915_FLUSH)
@@ -248,7 +247,6 @@ typedef struct _drm_i915_sarea {
 #define DRM_IOCTL_I915_GEM_CONTEXT_CREATE      DRM_IOWR (DRM_COMMAND_BASE + DRM_I915_GEM_CONTEXT_CREATE, struct drm_i915_gem_context_create)
 #define DRM_IOCTL_I915_GEM_CONTEXT_DESTROY     DRM_IOW (DRM_COMMAND_BASE + DRM_I915_GEM_CONTEXT_DESTROY, struct drm_i915_gem_context_destroy)
 #define DRM_IOCTL_I915_REG_READ                        DRM_IOWR (DRM_COMMAND_BASE + DRM_I915_REG_READ, struct drm_i915_reg_read)
-#define DRM_IOCTL_I915_GET_RESET_STATS         DRM_IOWR (DRM_COMMAND_BASE + DRM_I915_GET_RESET_STATS, struct drm_i915_reset_stats)
 
 /* Allow drivers to submit batchbuffers directly to hardware, relying
  * on the security mechanisms provided by hardware.
@@ -945,19 +943,4 @@ struct drm_i915_reg_read {
        __u64 offset;
        __u64 val; /* Return value */
 };
-
-struct drm_i915_reset_stats {
-       __u32 ctx_id;
-       __u32 flags;
-
-       /* For all contexts */
-       __u32 reset_count;
-
-       /* For this context */
-       __u32 batch_active;
-       __u32 batch_pending;
-
-       __u32 pad;
-};
-
 #endif                         /* _I915_DRM_H_ */

diff --git a/intel/intel_bufmgr.h b/intel/intel_bufmgr.h
index 2eb9742..15f818e 100644 (file)
--- 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 df6fcec..029ca5d 100644 (file)
--- a/intel/intel_bufmgr_gem.c
+++ b/intel/intel_bufmgr_gem.c
@@ -3021,40 +3021,6 @@ drm_intel_gem_context_destroy(drm_intel_context *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,
                   uint64_t *result)