i965/drm: Check INTEL_DEBUG & DEBUG_BUFMGR directly.

Eliminates some API around this, and more importantly, the last
field in one bufmgr class.

Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Jason Ekstrand <jason@jlekstrand.net>

diff --git a/src/mesa/drivers/dri/i965/brw_bufmgr.h b/src/mesa/drivers/dri/i965/brw_bufmgr.h
index a9cf0ff85f21e5e7158eb4196574522b0174299d..2cc636c714939ed7e1f953dd74ab7c30790165f2 100644 (file)
--- a/src/mesa/drivers/dri/i965/brw_bufmgr.h
+++ b/src/mesa/drivers/dri/i965/brw_bufmgr.h
@@ -126,7 +126,6 @@ int drm_bacon_bo_get_subdata(drm_bacon_bo *bo, unsigned long offset,
                             unsigned long size, void *data);
 void drm_bacon_bo_wait_rendering(drm_bacon_bo *bo);
 
-void drm_bacon_bufmgr_set_debug(drm_bacon_bufmgr *bufmgr, int enable_debug);
 void drm_bacon_bufmgr_destroy(drm_bacon_bufmgr *bufmgr);
 int drm_bacon_bo_exec(drm_bacon_bo *bo, int used,
                      struct drm_clip_rect *cliprects, int num_cliprects, int DR4);

diff --git a/src/mesa/drivers/dri/i965/intel_bufmgr.c b/src/mesa/drivers/dri/i965/intel_bufmgr.c
index a8e8ae7da65e621935e67f10437e5b969d707df4..a87286c971a4b5a241571578914914e067cee786 100644 (file)
--- a/src/mesa/drivers/dri/i965/intel_bufmgr.c
+++ b/src/mesa/drivers/dri/i965/intel_bufmgr.c
@@ -175,12 +175,6 @@ drm_bacon_bo_mrb_exec(drm_bacon_bo *bo, int used,
        }
 }
 
-void
-drm_bacon_bufmgr_set_debug(drm_bacon_bufmgr *bufmgr, int enable_debug)
-{
-       bufmgr->debug = enable_debug;
-}
-
 int
 drm_bacon_bufmgr_check_aperture_space(drm_bacon_bo ** bo_array, int count)
 {

diff --git a/src/mesa/drivers/dri/i965/intel_bufmgr_gem.c b/src/mesa/drivers/dri/i965/intel_bufmgr_gem.c
index b981658e920ae317f38f72eea7732a23cb508a79..749326891a06f8fed3b7edb04b53c781376bdc73 100644 (file)
--- a/src/mesa/drivers/dri/i965/intel_bufmgr_gem.c
+++ b/src/mesa/drivers/dri/i965/intel_bufmgr_gem.c
@@ -56,6 +56,7 @@
 #ifndef ETIME
 #define ETIME ETIMEDOUT
 #endif
+#include "common/gen_debug.h"
 #include "libdrm_macros.h"
 #include "main/macros.h"
 #include "util/macros.h"
@@ -78,10 +79,7 @@
 
 #define memclear(s) memset(&s, 0, sizeof(s))
 
-#define DBG(...) do {                                  \
-       if (bufmgr_gem->bufmgr.debug)                   \
-               fprintf(stderr, __VA_ARGS__);           \
-} while (0)
+#define FILE_DEBUG_FLAG DEBUG_BUFMGR
 
 static inline int
 atomic_add_unless(int *v, int add, int unless)
@@ -2107,7 +2105,7 @@ do_exec2(drm_bacon_bo *bo, int used, drm_bacon_context *ctx,
                *out_fence = execbuf.rsvd2 >> 32;
 
 skip_execution:
-       if (bufmgr_gem->bufmgr.debug)
+       if (INTEL_DEBUG & DEBUG_BUFMGR)
                drm_bacon_gem_dump_validation_list(bufmgr_gem);
 
        for (i = 0; i < bufmgr_gem->exec_count; i++) {
@@ -3180,7 +3178,6 @@ drm_bacon_bufmgr_gem_init(int fd, int batch_size)
        bufmgr_gem->bufmgr.bo_busy = drm_bacon_gem_bo_busy;
        bufmgr_gem->bufmgr.bo_madvise = drm_bacon_gem_bo_madvise;
        bufmgr_gem->bufmgr.destroy = drm_bacon_bufmgr_gem_unref;
-       bufmgr_gem->bufmgr.debug = 0;
        bufmgr_gem->bufmgr.check_aperture_space =
            drm_bacon_gem_check_aperture_space;
        bufmgr_gem->bufmgr.bo_disable_reuse = drm_bacon_gem_bo_disable_reuse;

diff --git a/src/mesa/drivers/dri/i965/intel_bufmgr_priv.h b/src/mesa/drivers/dri/i965/intel_bufmgr_priv.h
index 26ffd18234a747b89e42e03cf3fdd4d0333022be..6bc6c0b8e118f99b884ba34422b5e5ccaf35adae 100644 (file)
--- a/src/mesa/drivers/dri/i965/intel_bufmgr_priv.h
+++ b/src/mesa/drivers/dri/i965/intel_bufmgr_priv.h
@@ -275,9 +275,6 @@ struct _drm_bacon_bufmgr {
 
        /** Returns true if target_bo is in the relocation tree rooted at bo. */
        int (*bo_references) (drm_bacon_bo *bo, drm_bacon_bo *target_bo);
-
-       /**< Enables verbose debugging printouts */
-       int debug;
 };
 
 struct _drm_bacon_context {

diff --git a/src/mesa/drivers/dri/i965/intel_screen.c b/src/mesa/drivers/dri/i965/intel_screen.c
index 43d29ec07f3d0c9d817e310759941c4277e99a3a..7d53f8756d919c1c0823f09c415c0222cd72c2f8 100644 (file)
--- a/src/mesa/drivers/dri/i965/intel_screen.c
+++ b/src/mesa/drivers/dri/i965/intel_screen.c
@@ -1771,9 +1771,6 @@ __DRIconfig **intelInitScreen2(__DRIscreen *dri_screen)
 
    brw_process_intel_debug_variable();
 
-   if (INTEL_DEBUG & DEBUG_BUFMGR)
-      drm_bacon_bufmgr_set_debug(screen->bufmgr, true);
-
    if ((INTEL_DEBUG & DEBUG_SHADER_TIME) && devinfo->gen < 7) {
       fprintf(stderr,
               "shader_time debugging requires gen7 (Ivybridge) or better.\n");