i965: Remove use of deprecated drm_intel_aub routines

With mesa/drm commit cd2f91e18db087edf93fed828e568ee53b887860
Author: Kristian Høgsberg Kristensen <[email protected]>
Date:   Fri Jul 31 10:47:50 2015 -0700

    intel: Drop aub dumping functionality

the drm_intel_aub routines are mere stubs and do nothing. Likewise
remove our invocations.

Signed-off-by: Chris Wilson <[email protected]>
Reviewed-by: Kenneth Graunke <[email protected]>

6 files changed, 1 insertions, 96 deletions

diff --git a/src/mesa/drivers/dri/i965/brw_context.c b/src/mesa/drivers/dri/i965/brw_context.c
index cd3b53a5e0f..c8e7cc16809 100644
--- a/src/mesa/drivers/dri/i965/brw_context.c
+++ b/src/mesa/drivers/dri/i965/brw_context.c
@@ -1154,12 +1154,6 @@ intelDestroyContext(__DRIcontext * driContextPriv)
       (struct brw_context *) driContextPriv->driverPrivate;
    struct gl_context *ctx = &brw->ctx;
 
-   /* Dump a final BMP in case the application doesn't call SwapBuffers */
-   if (INTEL_DEBUG & DEBUG_AUB) {
-      intel_batchbuffer_flush(brw);
-      aub_dump_bmp(&brw->ctx);
-   }
-
    _mesa_meta_free(&brw->ctx);
 
    if (INTEL_DEBUG & DEBUG_SHADER_TIME) {
diff --git a/src/mesa/drivers/dri/i965/brw_context.h b/src/mesa/drivers/dri/i965/brw_context.h
index 893619117fa..96e225cbd1e 100644
--- a/src/mesa/drivers/dri/i965/brw_context.h
+++ b/src/mesa/drivers/dri/i965/brw_context.h
@@ -1261,7 +1261,6 @@ void brw_store_data_imm64(struct brw_context *brw, drm_intel_bo *bo,
  * brw_state_dump.c
  */
 void brw_debug_batch(struct brw_context *brw);
-void brw_annotate_aub(struct brw_context *brw);
 
 /*======================================================================
  * intel_tex_validate.c
diff --git a/src/mesa/drivers/dri/i965/brw_state_batch.c b/src/mesa/drivers/dri/i965/brw_state_batch.c
index 9658b48ca13..80c012b108f 100644
--- a/src/mesa/drivers/dri/i965/brw_state_batch.c
+++ b/src/mesa/drivers/dri/i965/brw_state_batch.c
@@ -60,50 +60,6 @@ brw_track_state_batch(struct brw_context *brw,
 }
 
 /**
- * Convenience function to populate a single drm_intel_aub_annotation data
- * structure.
- */
-static inline void
-make_annotation(drm_intel_aub_annotation *annotation, uint32_t type,
-                uint32_t subtype, uint32_t ending_offset)
-{
-   annotation->type = type;
-   annotation->subtype = subtype;
-   annotation->ending_offset = ending_offset;
-}
-
-/**
- * Generate a set of aub file annotations for the current batch buffer, and
- * deliver them to DRM.
- *
- * The "used" section of the batch buffer (the portion containing batch
- * commands) is annotated with AUB_TRACE_TYPE_BATCH.  The remainder of the
- * batch buffer (which contains data structures pointed to by batch commands)
- * is annotated according to the type of each data structure.
- */
-void
-brw_annotate_aub(struct brw_context *brw)
-{
-   unsigned annotation_count = 2 * brw->state_batch_count + 1;
-   drm_intel_aub_annotation annotations[annotation_count];
-   int a = 0;
-   make_annotation(&annotations[a++], AUB_TRACE_TYPE_BATCH, 0,
-                   4 * USED_BATCH(brw->batch));
-   for (int i = brw->state_batch_count; i-- > 0; ) {
-      uint32_t type = brw->state_batch_list[i].type;
-      uint32_t start_offset = brw->state_batch_list[i].offset;
-      uint32_t end_offset = start_offset + brw->state_batch_list[i].size;
-      make_annotation(&annotations[a++], AUB_TRACE_TYPE_NOTYPE, 0,
-                      start_offset);
-      make_annotation(&annotations[a++], AUB_TRACE_TYPE(type),
-                      AUB_TRACE_SUBTYPE(type), end_offset);
-   }
-   assert(a == annotation_count);
-   drm_intel_bufmgr_gem_set_aub_annotations(brw->batch.bo, annotations,
-                                            annotation_count);
-}
-
-/**
  * Allocates a block of space in the batchbuffer for indirect state.
  *
  * We don't want to allocate separate BOs for every bit of indirect
@@ -144,7 +100,7 @@ __brw_state_batch(struct brw_context *brw,
 
    batch->state_batch_offset = offset;
 
-   if (unlikely(INTEL_DEBUG & (DEBUG_BATCH | DEBUG_AUB)))
+   if (unlikely(INTEL_DEBUG & DEBUG_BATCH))
       brw_track_state_batch(brw, type, offset, size, index);
 
    *out_offset = offset;
diff --git a/src/mesa/drivers/dri/i965/intel_batchbuffer.c b/src/mesa/drivers/dri/i965/intel_batchbuffer.c
index ae0fd4cd7ab..afa061d70df 100644
--- a/src/mesa/drivers/dri/i965/intel_batchbuffer.c
+++ b/src/mesa/drivers/dri/i965/intel_batchbuffer.c
@@ -343,9 +343,6 @@ do_flush_locked(struct brw_context *brw, int in_fence_fd, int *out_fence_fd)
 	 flags |= I915_EXEC_GEN7_SOL_RESET;
 
       if (ret == 0) {
-         if (unlikely(INTEL_DEBUG & DEBUG_AUB))
-            brw_annotate_aub(brw);
-
 	 if (brw->hw_ctx == NULL || batch->ring != RENDER_RING) {
             assert(in_fence_fd == -1);
             assert(out_fence_fd == NULL);
diff --git a/src/mesa/drivers/dri/i965/intel_screen.c b/src/mesa/drivers/dri/i965/intel_screen.c
index 9cd2a657d8d..21786eb54ab 100644
--- a/src/mesa/drivers/dri/i965/intel_screen.c
+++ b/src/mesa/drivers/dri/i965/intel_screen.c
@@ -123,39 +123,6 @@ get_time(void)
    return tp.tv_sec + tp.tv_nsec / 1000000000.0;
 }
 
-void
-aub_dump_bmp(struct gl_context *ctx)
-{
-   struct gl_framebuffer *fb = ctx->DrawBuffer;
-
-   for (unsigned i = 0; i < fb->_NumColorDrawBuffers; i++) {
-      struct intel_renderbuffer *irb =
-	 intel_renderbuffer(fb->_ColorDrawBuffers[i]);
-
-      if (irb && irb->mt) {
-	 enum aub_dump_bmp_format format;
-
-	 switch (irb->Base.Base.Format) {
-	 case MESA_FORMAT_B8G8R8A8_UNORM:
-	 case MESA_FORMAT_B8G8R8X8_UNORM:
-	    format = AUB_DUMP_BMP_FORMAT_ARGB_8888;
-	    break;
-	 default:
-	    continue;
-	 }
-
-         drm_intel_gem_bo_aub_dump_bmp(irb->mt->bo,
-				       irb->draw_x,
-				       irb->draw_y,
-				       irb->Base.Base.Width,
-				       irb->Base.Base.Height,
-				       format,
-				       irb->mt->pitch,
-				       0);
-      }
-   }
-}
-
 static const __DRItexBufferExtension intelTexBufferExtension = {
    .base = { __DRI_TEX_BUFFER, 3 },
 
@@ -188,10 +155,6 @@ intel_dri2_flush_with_flags(__DRIcontext *cPriv,
       brw->need_flush_throttle = true;
 
    intel_batchbuffer_flush(brw);
-
-   if (INTEL_DEBUG & DEBUG_AUB) {
-      aub_dump_bmp(ctx);
-   }
 }
 
 /**
@@ -1689,9 +1652,6 @@ __DRIconfig **intelInitScreen2(__DRIscreen *dri_screen)
       INTEL_DEBUG &= ~DEBUG_SHADER_TIME;
    }
 
-   if (INTEL_DEBUG & DEBUG_AUB)
-      drm_intel_bufmgr_gem_set_aub_dump(screen->bufmgr, true);
-
    if (intel_get_integer(screen, I915_PARAM_MMAP_GTT_VERSION) >= 1) {
       /* Theorectically unlimited! At least for individual objects...
        *
diff --git a/src/mesa/drivers/dri/i965/intel_screen.h b/src/mesa/drivers/dri/i965/intel_screen.h
index 41db83bb679..d8cda58c964 100644
--- a/src/mesa/drivers/dri/i965/intel_screen.h
+++ b/src/mesa/drivers/dri/i965/intel_screen.h
@@ -118,7 +118,6 @@ intelMakeCurrent(__DRIcontext * driContextPriv,
                  __DRIdrawable * driReadPriv);
 
 double get_time(void);
-void aub_dump_bmp(struct gl_context *ctx);
 
 const int*
 intel_supported_msaa_modes(const struct intel_screen  *screen);