summaryrefslogtreecommitdiffstats
path: root/src/mesa/drivers
diff options
context:
space:
mode:
authorKenneth Graunke <[email protected]>2014-01-29 09:24:32 -0800
committerKenneth Graunke <[email protected]>2014-02-03 16:16:35 -0800
commite396674d5fb06ef467c7b66cf14ff89df64f2101 (patch)
tree20fefd36dff74fbb73b39bafc72545206cae2f15 /src/mesa/drivers
parentd613bafe9111a577bed6bb89ef559df40712674c (diff)
i965: Use brw_bo_map() in intel_texsubimage_tiled_memcpy().
This additionally measures the time stalled, while also simplifying the code. Signed-off-by: Kenneth Graunke <[email protected]> Reviewed-by: Carl Worth <[email protected]> Reviewed-by: Eric Anholt <[email protected]>
Diffstat (limited to 'src/mesa/drivers')
-rw-r--r--src/mesa/drivers/dri/i965/intel_tex_subimage.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/src/mesa/drivers/dri/i965/intel_tex_subimage.c b/src/mesa/drivers/dri/i965/intel_tex_subimage.c
index ce8bbe17e02..6942039fdc9 100644
--- a/src/mesa/drivers/dri/i965/intel_tex_subimage.c
+++ b/src/mesa/drivers/dri/i965/intel_tex_subimage.c
@@ -610,13 +610,7 @@ intel_texsubimage_tiled_memcpy(struct gl_context * ctx,
intel_batchbuffer_flush(brw);
}
- if (unlikely(brw->perf_debug)) {
- if (drm_intel_bo_busy(bo)) {
- perf_debug("Mapping a busy BO, causing a stall on the GPU.\n");
- }
- }
-
- error = drm_intel_bo_map(bo, true /*write_enable*/);
+ error = brw_bo_map(brw, bo, true /* write enable */, "miptree");
if (error || bo->virtual == NULL) {
DBG("%s: failed to map bo\n", __FUNCTION__);
return false;