From 20a4d7181983c7fed289844be49ccaf3f56965c6 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Thu, 12 Jan 2012 21:05:51 +0000 Subject: [PATCH] sna: Dump batch contents for debugging before modification We need to dump the batch contents before the maps are made by the construction of the batch itself. Signed-off-by: Chris Wilson --- src/sna/kgem.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/sna/kgem.c b/src/sna/kgem.c index 50ed4bf1..be01f67b 100644 --- a/src/sna/kgem.c +++ b/src/sna/kgem.c @@ -1432,6 +1432,10 @@ void _kgem_submit(struct kgem *kgem) kgem_finish_partials(kgem); +#if DEBUG_BATCH + __kgem_batch_debug(kgem, batch_end); +#endif + rq = kgem->next_request; if (kgem->surface != kgem->max_batch_size) size = compact_batch_surface(kgem); @@ -1460,10 +1464,6 @@ void _kgem_submit(struct kgem *kgem) kgem_fixup_self_relocs(kgem, rq->bo); -#if DEBUG_BATCH - __kgem_batch_debug(kgem, batch_end); -#endif - if (kgem_batch_write(kgem, handle, size) == 0) { struct drm_i915_gem_execbuffer2 execbuf; int ret, retry = 3; @@ -2343,8 +2343,6 @@ static void _kgem_bo_delete_partial(struct kgem *kgem, struct kgem_bo *bo) io->used = bo->delta; bubble_sort_partial(kgem, io); } - - assert(validate_partials(kgem)); } void _kgem_bo_destroy(struct kgem *kgem, struct kgem_bo *bo) @@ -2860,6 +2858,8 @@ struct kgem_bo *kgem_create_proxy(struct kgem_bo *target, struct kgem_bo *bo; assert(target->proxy == NULL); + DBG(("%s: target handle=%d, offset=%d, length=%d, io=%d\n", + __FUNCTION__, target->handle, offset, length, target->io)); bo = __kgem_bo_alloc(target->handle, length); if (bo == NULL)