summaryrefslogtreecommitdiff
path: root/intel
diff options
context:
space:
mode:
authorIan Romanick <ian.d.romanick@intel.com>2012-09-10 14:15:02 +0300
committerIan Romanick <ian.d.romanick@intel.com>2013-02-20 11:34:09 -0800
commit588d7b9af28f46dbe6ac50e54229e5cb71e229d6 (patch)
treeb92ec5a2baaeacf5109afce7f1ae697b558188b6 /intel
parent36d18211b196cad4761ac70c4fd08aba323f5b0d (diff)
intel: Add support for GPU reset status query ioctlHEADmaster
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Diffstat (limited to 'intel')
-rw-r--r--intel/intel_bufmgr.h3
-rw-r--r--intel/intel_bufmgr_gem.c23
2 files changed, 26 insertions, 0 deletions
diff --git a/intel/intel_bufmgr.h b/intel/intel_bufmgr.h
index 8d7f2390..757a2562 100644
--- a/intel/intel_bufmgr.h
+++ b/intel/intel_bufmgr.h
@@ -245,6 +245,9 @@ int drm_intel_reg_read(drm_intel_bufmgr *bufmgr,
uint32_t offset,
uint64_t *result);
+int drm_intel_gem_context_get_reset_status(drm_intel_context *ctx,
+ uint32_t *status);
+
/** @{ 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 d21547ea..1ac03b52 100644
--- a/intel/intel_bufmgr_gem.c
+++ b/intel/intel_bufmgr_gem.c
@@ -2962,6 +2962,29 @@ drm_intel_gem_context_destroy(drm_intel_context *ctx)
}
int
+drm_intel_gem_context_get_reset_status(drm_intel_context *ctx, uint32_t *status)
+{
+ drm_intel_bufmgr_gem *bufmgr_gem;
+ struct drm_i915_gem_context_get_reset_status reset_status;
+ int ret;
+
+ if (ctx == NULL)
+ return -EINVAL;
+
+ VG_CLEAR(reset_status);
+
+ bufmgr_gem = (drm_intel_bufmgr_gem *)ctx->bufmgr;
+ reset_status.ctx_id = ctx->ctx_id;
+ ret = drmIoctl(bufmgr_gem->fd,
+ DRM_IOCTL_I915_GEM_CONTEXT_GET_RESET_STATUS,
+ &reset_status);
+ if (ret == 0)
+ *status = reset_status.status;
+
+ return ret;
+}
+
+int
drm_intel_reg_read(drm_intel_bufmgr *bufmgr,
uint32_t offset,
uint64_t *result)