i965: Add function to query the GPU reset status for a context

v2: Update based on kernel interface / libdrm changes.

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>

diff --git a/src/mesa/drivers/dri/i965/Makefile.sources b/src/mesa/drivers/dri/i965/Makefile.sources
index be26a558a0068824297ae6d9a9da7d1c69d59d1e..572445829af58538ba1d28d832abb18f7dceea47 100644 (file)
--- a/src/mesa/drivers/dri/i965/Makefile.sources
+++ b/src/mesa/drivers/dri/i965/Makefile.sources
@@ -75,6 +75,7 @@ i965_FILES = \
        brw_program.c \
        brw_primitive_restart.c \
        brw_queryobj.c \
+       brw_reset.c \
        brw_schedule_instructions.cpp \
        brw_sf.c \
        brw_sf_emit.c \

diff --git a/src/mesa/drivers/dri/i965/brw_context.h b/src/mesa/drivers/dri/i965/brw_context.h
index 45225bcce1ca2bf0655700b347b7bea1de1287bd..9bc6f56590bc46833b81ffec7fc309221dd83430 100644 (file)
--- a/src/mesa/drivers/dri/i965/brw_context.h
+++ b/src/mesa/drivers/dri/i965/brw_context.h
@@ -1674,6 +1674,9 @@ gen7_emit_urb_state(struct brw_context *brw,
                     unsigned gs_size, unsigned gs_start);
 
 
+/* brw_reset.c */
+extern GLenum
+brw_get_graphics_reset_status(struct gl_context *ctx);
 
 /*======================================================================
  * Inline conversion functions.  These are better-typed than the

diff --git a/src/mesa/drivers/dri/i965/brw_reset.c b/src/mesa/drivers/dri/i965/brw_reset.c
new file mode 100644 (file)
index 0000000..7eca1bc
--- /dev/null
+++ b/src/mesa/drivers/dri/i965/brw_reset.c
@@ -0,0 +1,67 @@
+/*
+ * Copyright © 2012 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
+#include "brw_context.h"
+
+/**
+ * Query information about GPU resets observed by this context
+ *
+ * Called via \c dd_function_table::GetGraphicsResetStatus.
+ */
+GLenum
+brw_get_graphics_reset_status(struct gl_context *ctx)
+{
+   struct brw_context *brw = brw_context(ctx);
+   int err;
+   uint32_t reset_count;
+   uint32_t active;
+   uint32_t pending;
+
+   /* If hardware contexts are not being used (or
+    * DRM_IOCTL_I915_GET_RESET_STATS is not supported), this function should
+    * not be accessible.
+    */
+   assert(brw->hw_ctx != NULL);
+
+   err = drm_intel_get_reset_stats(brw->hw_ctx, &reset_count, &active,
+                                   &pending);
+   if (err)
+      return GL_NO_ERROR;
+
+   /* A reset was observed while a batch from this context was executing.
+    * Assume that this context was at fault.
+    */
+   if (active != 0)
+      return GL_GUILTY_CONTEXT_RESET_ARB;
+
+   /* A reset was observed while a batch from this context was in progress,
+    * but the batch was not executing.  In this case, assume that the context
+    * was not at fault.
+    */
+   if (pending != 0)
+      return GL_INNOCENT_CONTEXT_RESET_ARB;
+
+   /* FINISHME: Should we report anything if reset_count > brw->reset_count?
+    */
+
+   return GL_NO_ERROR;
+}