diff options
| author | Samuel Pitoiset <samuel.pitoiset@gmail.com> | 2016-02-22 23:20:30 +0100 |
|---|---|---|
| committer | Samuel Pitoiset <samuel.pitoiset@gmail.com> | 2016-04-01 22:26:24 +0200 |
| commit | 275019d7db033286e41eb4983ac50d3d3d335586 (patch) | |
| tree | ce89703a00ee38e1a8aef15731accc9957c8f67b /src/gallium/drivers/nouveau | |
| parent | 4f58b78c309db372d408912ca87e88d319b895da (diff) | |
| download | external_mesa3d-275019d7db033286e41eb4983ac50d3d3d335586.zip external_mesa3d-275019d7db033286e41eb4983ac50d3d3d335586.tar.gz external_mesa3d-275019d7db033286e41eb4983ac50d3d3d335586.tar.bz2 | |
nvc0/ir: fix wrong pred emission for ld lock on GK104
This fixes 84b9b8f (nvc0/ir: add missing emission of locked load
predicate).
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Ilia Mirkin <imirkin@alum.mit.edu>
Diffstat (limited to 'src/gallium/drivers/nouveau')
| -rw-r--r-- | src/gallium/drivers/nouveau/codegen/nv50_ir_emit_nvc0.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/gallium/drivers/nouveau/codegen/nv50_ir_emit_nvc0.cpp b/src/gallium/drivers/nouveau/codegen/nv50_ir_emit_nvc0.cpp index 8b9328b..d61109f 100644 --- a/src/gallium/drivers/nouveau/codegen/nv50_ir_emit_nvc0.cpp +++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_emit_nvc0.cpp @@ -1858,7 +1858,10 @@ CodeEmitterNVC0::emitLOAD(const Instruction *i) if (i->src(0).getFile() == FILE_MEMORY_SHARED) { if (i->subOp == NV50_IR_SUBOP_LOAD_LOCKED) { assert(i->defExists(1)); - defId(i->def(1), 32 + 18); + if (targ->getChipset() >= NVISA_GK104_CHIPSET) + defId(i->def(1), 8); + else + defId(i->def(1), 32 + 18); } } |