From: Eric Engestrom <eric.engestrom@intel.com>
Date: Mon, 29 Jul 2019 14:11:13 +0000 (+0100)
Subject: intel/mi: only resolve to a temp register if source isn't in memory
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=8486dbb066e03ac2fa94ced63716ec2ce4bdfde8;p=mesa.git

intel/mi: only resolve to a temp register if source isn't in memory

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>
---

diff --git a/src/intel/common/gen_mi_builder.h b/src/intel/common/gen_mi_builder.h
index 3590acb7b62..dd7d87fc67a 100644
--- a/src/intel/common/gen_mi_builder.h
+++ b/src/intel/common/gen_mi_builder.h
@@ -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);