diff --git a/src/gallium/drivers/nouveau/codegen/nv50_ir_emit_gv100.cpp b/src/gallium/drivers/nouveau/codegen/nv50_ir_emit_gv100.cpp
index da8f71c6fd0..be3d9c22136 100644
--- a/src/gallium/drivers/nouveau/codegen/nv50_ir_emit_gv100.cpp
+++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_emit_gv100.cpp
@@ -1117,8 +1117,11 @@ CodeEmitterGV100::emitOUT()
 
    if (insn->op != OP_FINAL)
       emitFormA(0x124, FA_RRR | FA_RIR, __(0), __(1), EMPTY);
-   else
+   else {
       emitFormA(0x124, FA_RRR | FA_RIR, __(0), EMPTY, EMPTY);
+      if (targ->getChipset() >= 0x170)
+         emitGPR(32);
+   }
    emitField(78, 2, (cut << 1) | emit);
 }