From da738d1ed0a0941a0cd061395ad86072171b3242 Mon Sep 17 00:00:00 2001 From: Dave Airlie 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. --- include/drm/i915_drm.h | 17 ----------------- 1 file changed, 17 deletions(-) (limited to 'include/drm/i915_drm.h') diff --git a/include/drm/i915_drm.h b/include/drm/i915_drm.h index 2703dede..aa983f34 100644 --- 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_ */ -- cgit v1.2.3