diff options
Diffstat (limited to 'src/mesa/drivers')
-rw-r--r-- | src/mesa/drivers/dri/i965/brw_context.h | 6 | ||||
-rw-r--r-- | src/mesa/drivers/dri/i965/intel_buffer_objects.c | 40 |
2 files changed, 46 insertions, 0 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_context.h b/src/mesa/drivers/dri/i965/brw_context.h index afa335041e9..a0189b77bad 100644 --- a/src/mesa/drivers/dri/i965/brw_context.h +++ b/src/mesa/drivers/dri/i965/brw_context.h @@ -1658,6 +1658,12 @@ void brw_dump_perf_monitors(struct brw_context *brw); void brw_perf_monitor_new_batch(struct brw_context *brw); void brw_perf_monitor_finish_batch(struct brw_context *brw); +/* intel_buffer_objects.c */ +int brw_bo_map(struct brw_context *brw, drm_intel_bo *bo, int write_enable, + const char *bo_name); +int brw_bo_map_gtt(struct brw_context *brw, drm_intel_bo *bo, + const char *bo_name); + /* intel_extensions.c */ extern void intelInitExtensions(struct gl_context *ctx); diff --git a/src/mesa/drivers/dri/i965/intel_buffer_objects.c b/src/mesa/drivers/dri/i965/intel_buffer_objects.c index 4d7044a4722..a493c3b7d57 100644 --- a/src/mesa/drivers/dri/i965/intel_buffer_objects.c +++ b/src/mesa/drivers/dri/i965/intel_buffer_objects.c @@ -41,6 +41,46 @@ #include "intel_buffer_objects.h" #include "intel_batchbuffer.h" +/** + * Map a buffer object; issue performance warnings if mapping causes stalls. + * + * This matches the drm_intel_bo_map API, but takes an additional human-readable + * name for the buffer object to use in the performance debug message. + */ +int +brw_bo_map(struct brw_context *brw, + drm_intel_bo *bo, int write_enable, + const char *bo_name) +{ + if (likely(!brw->perf_debug) || !drm_intel_bo_busy(bo)) + return drm_intel_bo_map(bo, write_enable); + + float start_time = get_time(); + + int ret = drm_intel_bo_map(bo, write_enable); + + perf_debug("CPU mapping a busy %s BO stalled and took %.03f ms.\n", + bo_name, (get_time() - start_time) * 1000); + + return ret; +} + +int +brw_bo_map_gtt(struct brw_context *brw, drm_intel_bo *bo, const char *bo_name) +{ + if (likely(!brw->perf_debug) || !drm_intel_bo_busy(bo)) + return drm_intel_gem_bo_map_gtt(bo); + + float start_time = get_time(); + + int ret = drm_intel_gem_bo_map_gtt(bo); + + perf_debug("GTT mapping a busy %s BO stalled and took %.03f ms.\n", + bo_name, (get_time() - start_time) * 1000); + + return ret; +} + static GLboolean intel_bufferobj_unmap(struct gl_context * ctx, struct gl_buffer_object *obj); |