Mesa (12.0): gk110/ir: fix quadop dall emission

Emil Velikov evelikov at kemper.freedesktop.org
Mon Sep 5 14:52:06 UTC 2016


Module: Mesa
Branch: 12.0
Commit: 8e9b6161eb327f9fb030b976a6078376f80a8f9b
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=8e9b6161eb327f9fb030b976a6078376f80a8f9b

Author: Ilia Mirkin <imirkin at alum.mit.edu>
Date:   Sun Sep  4 18:21:29 2016 -0400

gk110/ir: fix quadop dall emission

We recently starting to always emit the NDV (== dall) bit for quadops.
However it was folded into the wrong code word.

Fixes: e0a067ed48 (nv50/ir: always emit the NDV bit for OP_QUADOP)
Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
Cc: <mesa-stable at lists.freedesktop.org>
(cherry picked from commit 61e978524a0e5de4f8570b44bcb9b907a9187684)

---

 src/gallium/drivers/nouveau/codegen/nv50_ir_emit_gk110.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gallium/drivers/nouveau/codegen/nv50_ir_emit_gk110.cpp b/src/gallium/drivers/nouveau/codegen/nv50_ir_emit_gk110.cpp
index b3e6c56..939972d 100644
--- a/src/gallium/drivers/nouveau/codegen/nv50_ir_emit_gk110.cpp
+++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_emit_gk110.cpp
@@ -1320,8 +1320,8 @@ CodeEmitterGK110::emitTXQ(const TexInstruction *i)
 void
 CodeEmitterGK110::emitQUADOP(const Instruction *i, uint8_t qOp, uint8_t laneMask)
 {
-   code[0] = 0x00000202 | ((qOp & 1) << 31); // dall
-   code[1] = 0x7fc00000 | (qOp >> 1) | (laneMask << 12);
+   code[0] = 0x00000002 | ((qOp & 1) << 31);
+   code[1] = 0x7fc00200 | (qOp >> 1) | (laneMask << 12); // dall
 
    defId(i->def(0), 2);
    srcId(i->src(0), 10);




More information about the mesa-commit mailing list