From: Dave Airlie <airlied@redhat.com>
Date: Mon, 27 Nov 2017 06:39:49 +0000 (+0000)
Subject: r600/cayman: looks like cmpxchg moved to Z
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=c758fd05d84e7a88966a103d57b61285f56a0e81;p=mesa.git

r600/cayman: looks like cmpxchg moved to Z

On cayman it appears the cmp component is now in Z.

Fixes:
arb_shader_image_load_store-dead-fragments on cayman.

Signed-off-by: Dave Airlie <airlied@redhat.com>
---

diff --git a/src/gallium/drivers/r600/r600_shader.c b/src/gallium/drivers/r600/r600_shader.c
index 55320cf860d..ae8326fdd14 100644
--- a/src/gallium/drivers/r600/r600_shader.c
+++ b/src/gallium/drivers/r600/r600_shader.c
@@ -8083,9 +8083,12 @@ static int tgsi_atomic_op_rat(struct r600_shader_ctx *ctx)
 			return r;
 
 		memset(&alu, 0, sizeof(struct r600_bytecode_alu));
-	       alu.op = ALU_OP1_MOV;
+		alu.op = ALU_OP1_MOV;
 		alu.dst.sel = ctx->thread_id_gpr;
-		alu.dst.chan = 3;
+		if (ctx->bc->chip_class == CAYMAN)
+			alu.dst.chan = 2;
+		else
+			alu.dst.chan = 3;
 		alu.dst.write = 1;
 		r600_bytecode_src(&alu.src[0], &ctx->src[2], 0);
 		alu.last = 1;