diff --git a/src/gallium/drivers/nouveau/codegen/nv50_ir_emit_gm107.cpp b/src/gallium/drivers/nouveau/codegen/nv50_ir_emit_gm107.cpp
index fafece8..dbf8cfd 100644
--- a/src/gallium/drivers/nouveau/codegen/nv50_ir_emit_gm107.cpp
+++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_emit_gm107.cpp
@@ -2907,17 +2907,17 @@ CodeEmitterGM107::emitBAR()
       ImmediateValue *imm = insn->getSrc(0)->asImm();
       assert(imm);
       emitField(0x08, 8, imm->reg.data.u32);
-      emitField(0x2b, 1, 1);
+      emitField(0x2c, 1, 1);
    }
 
    // thread count
    if (insn->src(1).getFile() == FILE_GPR) {
       emitGPR(0x14, insn->src(1));
    } else {
-      ImmediateValue *imm = insn->getSrc(0)->asImm();
+      ImmediateValue *imm = insn->getSrc(1)->asImm();
       assert(imm);
       emitField(0x14, 12, imm->reg.data.u32);
-      emitField(0x2c, 1, 1);
+      emitField(0x2b, 1, 1);
    }
 
    if (insn->srcExists(2) && (insn->predSrc != 2)) {