diff options
author | Chris Wilson <chris@chris-wilson.co.uk> | 2011-02-01 10:53:57 +0000 |
---|---|---|
committer | Chris Wilson <chris@chris-wilson.co.uk> | 2011-02-01 10:56:46 +0000 |
commit | 371f87f2d825900484e34a8ec78272b9e62cbc02 (patch) | |
tree | 7dea0d2304d2027c13ccf945fb1811cf999d27f0 /lib | |
parent | 5fc09c82d40113a7ebf67b7dbc374c181d9fafe3 (diff) |
Exercise the whole aperture with tiled blits
After full-gtt, gem_tiled_blits doesn't allocate enough to force
eviction. So query the total aperture and accommodate.
Also introduce a similar test that utilizes fences rather than
use the BLT to perform the tiling and detiling.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'lib')
-rw-r--r-- | lib/intel_batchbuffer.c | 31 | ||||
-rw-r--r-- | lib/intel_batchbuffer.h | 29 |
2 files changed, 15 insertions, 45 deletions
diff --git a/lib/intel_batchbuffer.c b/lib/intel_batchbuffer.c index 54154692..449d46de 100644 --- a/lib/intel_batchbuffer.c +++ b/lib/intel_batchbuffer.c @@ -46,15 +46,10 @@ intel_batchbuffer_reset(struct intel_batchbuffer *batch) batch->bo = NULL; } - if (!batch->buffer) - batch->buffer = malloc(BATCH_SZ); - batch->bo = drm_intel_bo_alloc(batch->bufmgr, "batchbuffer", BATCH_SZ, 4096); - batch->map = batch->buffer; - batch->size = BATCH_SZ; - batch->ptr = batch->map; + batch->ptr = batch->buffer; } struct intel_batchbuffer * @@ -72,8 +67,6 @@ intel_batchbuffer_alloc(drm_intel_bufmgr *bufmgr, uint32_t devid) void intel_batchbuffer_free(struct intel_batchbuffer *batch) { - free (batch->buffer); - drm_intel_bo_unreference(batch->bo); batch->bo = NULL; free(batch); @@ -82,7 +75,7 @@ intel_batchbuffer_free(struct intel_batchbuffer *batch) void intel_batchbuffer_flush(struct intel_batchbuffer *batch) { - unsigned int used = batch->ptr - batch->map; + unsigned int used = batch->ptr - batch->buffer; int ring; int ret; @@ -93,17 +86,16 @@ intel_batchbuffer_flush(struct intel_batchbuffer *batch) if ((used & 4) == 0) { *(uint32_t *) (batch->ptr) = 0; /* noop */ batch->ptr += 4; - used = batch->ptr - batch->map; } /* Mark the end of the buffer. */ - *(uint32_t *) (batch->ptr) = MI_BATCH_BUFFER_END; /* noop */ + *(uint32_t *)(batch->ptr) = MI_BATCH_BUFFER_END; /* noop */ batch->ptr += 4; - used = batch->ptr - batch->map; + used = batch->ptr - batch->buffer; - drm_intel_bo_subdata(batch->bo, 0, used, batch->buffer); + ret = drm_intel_bo_subdata(batch->bo, 0, used, batch->buffer); + assert(ret == 0); - batch->map = NULL; batch->ptr = NULL; ring = 0; @@ -125,12 +117,13 @@ intel_batchbuffer_emit_reloc(struct intel_batchbuffer *batch, { int ret; - if (batch->ptr - batch->map > batch->bo->size) - printf("bad relocation ptr %p map %p offset %d size %ld\n", - batch->ptr, batch->map, batch->ptr - batch->map, - batch->bo->size); + if (batch->ptr - batch->buffer > BATCH_SZ) + printf("bad relocation ptr %p map %p offset %d size %d\n", + batch->ptr, batch->buffer, + (int)(batch->ptr - batch->buffer), + BATCH_SZ); - ret = drm_intel_bo_emit_reloc(batch->bo, batch->ptr - batch->map, + ret = drm_intel_bo_emit_reloc(batch->bo, batch->ptr - batch->buffer, buffer, delta, read_domains, write_domain); intel_batchbuffer_emit_dword(batch, buffer->offset + delta); diff --git a/lib/intel_batchbuffer.h b/lib/intel_batchbuffer.h index 84f75761..a8271766 100644 --- a/lib/intel_batchbuffer.h +++ b/lib/intel_batchbuffer.h @@ -15,18 +15,8 @@ struct intel_batchbuffer drm_intel_bo *bo; - uint8_t *buffer; - - uint8_t *map; + uint8_t buffer[BATCH_SZ]; uint8_t *ptr; - - /* debug stuff */ - struct { - uint8_t *start_ptr; - unsigned int total; - } emit; - - unsigned int size; }; struct intel_batchbuffer *intel_batchbuffer_alloc(drm_intel_bufmgr *bufmgr, @@ -56,14 +46,13 @@ void intel_batchbuffer_emit_reloc(struct intel_batchbuffer *batch, static inline int intel_batchbuffer_space(struct intel_batchbuffer *batch) { - return (batch->size - BATCH_RESERVED) - (batch->ptr - batch->map); + return (BATCH_SZ - BATCH_RESERVED) - (batch->ptr - batch->buffer); } static inline void intel_batchbuffer_emit_dword(struct intel_batchbuffer *batch, uint32_t dword) { - assert(batch->map); assert(intel_batchbuffer_space(batch) >= 4); *(uint32_t *) (batch->ptr) = dword; batch->ptr += 4; @@ -73,7 +62,7 @@ static inline void intel_batchbuffer_require_space(struct intel_batchbuffer *batch, unsigned int sz) { - assert(sz < batch->size - 8); + assert(sz < BATCH_SZ - 8); if (intel_batchbuffer_space(batch) < sz) intel_batchbuffer_flush(batch); } @@ -84,9 +73,6 @@ intel_batchbuffer_require_space(struct intel_batchbuffer *batch, #define BEGIN_BATCH(n) do { \ intel_batchbuffer_require_space(batch, (n)*4); \ - assert(batch->emit.start_ptr == NULL); \ - batch->emit.total = (n) * 4; \ - batch->emit.start_ptr = batch->ptr; \ } while (0) #define OUT_BATCH(d) intel_batchbuffer_emit_dword(batch, d) @@ -98,15 +84,6 @@ intel_batchbuffer_require_space(struct intel_batchbuffer *batch, } while (0) #define ADVANCE_BATCH() do { \ - unsigned int _n = batch->ptr - batch->emit.start_ptr; \ - assert(batch->emit.start_ptr != NULL); \ - if (_n != batch->emit.total) { \ - fprintf(stderr, \ - "ADVANCE_BATCH: %d of %d dwords emitted\n", \ - _n, batch->emit.total); \ - abort(); \ - } \ - batch->emit.start_ptr = NULL; \ } while(0) |