ilo: EOL drop unmaintained gallium drv from buildsys

[mesa.git] / src / gallium / drivers / ilo / ilo_cp.c

diff --git a/src/gallium/drivers/ilo/ilo_cp.c b/src/gallium/drivers/ilo/ilo_cp.c
index 37e9b2ae2bf671fc63dedd84726ae9178d18631d..1f5d4ec7658815d9a429efdbc3548ed6c7bde558 100644 (file)
--- a/src/gallium/drivers/ilo/ilo_cp.c
+++ b/src/gallium/drivers/ilo/ilo_cp.c
@@ -25,9 +25,9 @@
  *    Chia-I Wu <olv@lunarg.com>
  */
 
-#include "intel_winsys.h"
+#include "core/ilo_builder_mi.h"
+#include "core/intel_winsys.h"
 
-#include "ilo_builder_mi.h"
 #include "ilo_shader.h"
 #include "ilo_cp.h"
 
@@ -48,10 +48,15 @@ ilo_cp_release_owner(struct ilo_cp *cp)
 
 /**
  * Set the parser owner.  If this is a new owner or a new ring, the old owner
- * is released and the new owner's own() is called.
+ * is released and the new owner's own() is called.  The parser may implicitly
+ * submit if there is a ring change.
  *
- * The parser may implicitly submit if there is a ring change or there is not
- * enough space for the new owner.
+ * own() is called before \p owner owns the parser.  It must make sure there
+ * is more space than \p owner->reserve when it returns.  Calling
+ * ilo_cp_submit() is allowed.
+ *
+ * release() will be called after \p owner loses the parser.  That may happen
+ * just before the parser submits and ilo_cp_submit() is not allowed.
  */
 void
 ilo_cp_set_owner(struct ilo_cp *cp, enum intel_ring_type ring,
@@ -68,16 +73,10 @@ ilo_cp_set_owner(struct ilo_cp *cp, enum intel_ring_type ring,
    if (cp->owner != owner) {
       ilo_cp_release_owner(cp);
 
-      /* multiply by 2 because there are own() and release() */
-      if (ilo_cp_space(cp) < owner->reserve * 2) {
-         ilo_cp_submit(cp, "new owner");
-         assert(ilo_cp_space(cp) >= owner->reserve * 2);
-      }
-
-      cp->owner = owner;
+      owner->own(cp, owner->data);
 
       assert(ilo_cp_space(cp) >= owner->reserve);
-      cp->owner->own(cp, cp->owner->data);
+      cp->owner = owner;
    }
 }
 
@@ -106,6 +105,35 @@ ilo_cp_end_batch(struct ilo_cp *cp, unsigned *used)
    return bo;
 }
 
+static bool
+ilo_cp_detect_hang(struct ilo_cp *cp)
+{
+   uint32_t active_lost, pending_lost;
+   bool guilty = false;
+
+   if (likely(!(ilo_debug & ILO_DEBUG_HANG)))
+      return false;
+
+   /* wait and get reset stats */
+   if (intel_bo_wait(cp->last_submitted_bo, -1) ||
+       intel_winsys_get_reset_stats(cp->winsys, cp->render_ctx,
+          &active_lost, &pending_lost))
+      return false;
+
+   if (cp->active_lost != active_lost) {
+      ilo_err("GPU hang caused by bo %p\n", cp->last_submitted_bo);
+      cp->active_lost = active_lost;
+      guilty = true;
+   }
+
+   if (cp->pending_lost != pending_lost) {
+      ilo_err("GPU hang detected\n");
+      cp->pending_lost = pending_lost;
+   }
+
+   return guilty;
+}
+
 /**
  * Flush the command parser and execute the commands.  When the parser buffer
  * is empty, the callback is not invoked.
@@ -133,13 +161,18 @@ ilo_cp_submit_internal(struct ilo_cp *cp)
    cp->one_off_flags = 0;
 
    if (!err) {
-      if (cp->last_submitted_bo)
-         intel_bo_unreference(cp->last_submitted_bo);
-      cp->last_submitted_bo = bo;
-      intel_bo_reference(cp->last_submitted_bo);
+      bool guilty;
 
-      if (ilo_debug & ILO_DEBUG_BATCH)
+      intel_bo_unref(cp->last_submitted_bo);
+      cp->last_submitted_bo = intel_bo_ref(bo);
+
+      guilty = ilo_cp_detect_hang(cp);
+
+      if (unlikely((ilo_debug & ILO_DEBUG_BATCH) || guilty)) {
          ilo_builder_decode(&cp->builder);
+         if (guilty)
+            abort();
+      }
 
       if (cp->submit_callback)
          cp->submit_callback(cp, cp->submit_callback_data);
@@ -164,7 +197,7 @@ ilo_cp_destroy(struct ilo_cp *cp)
  * Create a command parser.
  */
 struct ilo_cp *
-ilo_cp_create(const struct ilo_dev_info *dev,
+ilo_cp_create(const struct ilo_dev *dev,
               struct intel_winsys *winsys,
               struct ilo_shader_cache *shc)
 {