flywithu/ntel-gpu-tools
1
0
Fork 0
mirror of https://github.com/tiagovignatti/intel-gpu-tools.git synced 2025-06-27 01:36:17 +00:00
Code Issues Releases Wiki Activity

lib: fix gen5 workaround emission

Browse Source 
Using BEGIN_BATCH can lead to a nice inf recursion through require_space
-> flush_batch -> BEGIN_BATCH.

Also fix things up to always require BATCH_RESERVED. We need 2 dwords
for the gen5 workaround and 2 dwords for MI_BB_END.
This commit is contained in:
Daniel Vetter 2012-05-29 22:14:06 +02:00
parent 04dfa492d1
commit bfbe813f8f
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/intel_batchbuffer.c
View File

@ -84,10 +84,11 @@ intel_batchbuffer_flush_on_ring(struct intel_batchbuffer *batch, int ring)
return; return;
if (IS_GEN5(batch->devid)) { if (IS_GEN5(batch->devid)) {
BEGIN_BATCH(2); /* emit gen5 w/a without batch space checks - we reserve that
OUT_BATCH(CMD_POLY_STIPPLE_OFFSET << 16); * already. */
OUT_BATCH(0); *(uint32_t *) (batch->ptr) = CMD_POLY_STIPPLE_OFFSET << 16;
ADVANCE_BATCH(); *(uint32_t *) (batch->ptr) = 0;
batch->ptr += 8;
} }
/* Round batchbuffer usage to 2 DWORDs. */ /* Round batchbuffer usage to 2 DWORDs. */

2
lib/intel_batchbuffer.h
View File

@ -63,7 +63,7 @@ static inline void
intel_batchbuffer_require_space(struct intel_batchbuffer *batch, intel_batchbuffer_require_space(struct intel_batchbuffer *batch,
unsigned int sz) unsigned int sz)
{ {
assert(sz < BATCH_SZ - 8); assert(sz < BATCH_SZ - BATCH_RESERVED);
if (intel_batchbuffer_space(batch) < sz) if (intel_batchbuffer_space(batch) < sz)
intel_batchbuffer_flush(batch); intel_batchbuffer_flush(batch);
} }