From: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Date: Mon, 7 Mar 2016 17:26:43 +0000 (+0100)
Subject: nvc0/ir: make sure that thread count immediate for BAR fit
X-Git-Tag: android-x86-6.0-r1~3277
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=5777e87bed9de5db9ab08a1388265978507bc88e;p=android-x86%2Fexternal-mesa.git

nvc0/ir: make sure that thread count immediate for BAR fit

The limit of the thread count immediate value is 12 bits.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Ilia Mirkin <imirkin@alum.mit.edu>
---

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 7bd7c732c49..8b9328b6296 100644
--- a/src/gallium/drivers/nouveau/codegen/nv50_ir_emit_nvc0.cpp
+++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_emit_nvc0.cpp
@@ -1482,6 +1482,7 @@ CodeEmitterNVC0::emitBAR(const Instruction *i)
    } else {
       ImmediateValue *imm = i->getSrc(1)->asImm();
       assert(imm);
+      assert(imm->reg.data.u32 <= 0xfff);
       code[0] |= imm->reg.data.u32 << 26;
       code[1] |= imm->reg.data.u32 >> 6;
       code[1] |= 0x4000;