r600g: take into account kcache banks for bank swizzle check

Due to the changes for multiple kcache banks support, now we are assigning
final SRCx_SEL values for kcache access at the later stage, when building the
bytecode. So we need to take into account kcache banks to distinguish
the constants with the same address but different bank index.

Signed-off-by: Vadim Girlin <vadimgirlin@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>

diff --git a/src/gallium/drivers/r600/r600_asm.c b/src/gallium/drivers/r600/r600_asm.c
index 00ba8e0..70efc14 100644 (file)
--- a/src/gallium/drivers/r600/r600_asm.c
+++ b/src/gallium/drivers/r600/r600_asm.c
@@ -671,7 +671,7 @@ static int check_vector(struct r600_bytecode *bc, struct r600_bytecode_alu *alu,
                                        return r;
                        }
                } else if (is_cfile(sel)) {
-                       r = reserve_cfile(bc, bs, sel, elem);
+                       r = reserve_cfile(bc, bs, (alu->src[src].kc_bank<<16) + sel, elem);
                        if (r)
                                return r;
                }
@@ -698,7 +698,7 @@ static int check_scalar(struct r600_bytecode *bc, struct r600_bytecode_alu *alu,
                                const_count++;
                }
                if (is_cfile(sel)) {
-                       r = reserve_cfile(bc, bs, sel, elem);
+                       r = reserve_cfile(bc, bs, (alu->src[src].kc_bank<<16) + sel, elem);
                        if (r)
                                return r;
                }