intel/mi: only resolve to a temp register if source isn't in memory
authorEric Engestrom <eric.engestrom@intel.com>
Mon, 29 Jul 2019 14:11:13 +0000 (15:11 +0100)
committerKenneth Graunke <kenneth@whitecape.org>
Mon, 29 Jul 2019 20:35:42 +0000 (13:35 -0700)
aka. fix a s/||/&&/ typo

Fixes: 74063ee61aadd1371a9b ("intel/mi: Add a new gen_mi_store_if() helper.")
Signed-off-by: Eric Engestrom <eric.engestrom@intel.com>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
src/intel/common/gen_mi_builder.h

index 3590acb7b626a21c018bfdb6f8c12cc0d2af50ff..dd7d87fc67af4a0b1dcbf06621f741d3c65a60ce 100644 (file)
@@ -526,7 +526,7 @@ gen_mi_store_if(struct gen_mi_builder *b,
    assert(dst.type == GEN_MI_VALUE_TYPE_MEM64 ||
           dst.type == GEN_MI_VALUE_TYPE_MEM32);
 
-   if (src.type != GEN_MI_VALUE_TYPE_REG32 ||
+   if (src.type != GEN_MI_VALUE_TYPE_REG32 &&
        src.type != GEN_MI_VALUE_TYPE_REG64) {
       struct gen_mi_value tmp = gen_mi_new_gpr(b);
       _gen_mi_copy_no_unref(b, tmp, src);