Mesa (master): intel: fix MI builder for pre-gen7

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 10abc09a0444f0853e0c7208cb280ed2c2d477f0
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=10abc09a0444f0853e0c7208cb280ed2c2d477f0

Author: Ilia Mirkin <imirkin at alum.mit.edu>
Date:   Thu Dec  5 21:40:51 2019 -0500

intel: fix MI builder for pre-gen7

MI_LOAD_REGISTER_MEM is only available on gen7+, so avoid build errors
on earlier generations.

Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10636>

---

 src/intel/common/mi_builder.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/intel/common/mi_builder.h b/src/intel/common/mi_builder.h
index 71927ca9f59..a73f4996557 100644
--- a/src/intel/common/mi_builder.h
+++ b/src/intel/common/mi_builder.h
@@ -499,6 +499,7 @@ _mi_copy_no_unref(struct mi_builder *b,
 
       case MI_VALUE_TYPE_MEM32:
       case MI_VALUE_TYPE_MEM64:
+#if GFX_VER >= 7
          mi_builder_emit(b, GENX(MI_LOAD_REGISTER_MEM), lrm) {
             struct mi_reg_num reg = mi_adjust_reg_num(dst.reg);
             lrm.RegisterAddress = reg.num;
@@ -507,6 +508,9 @@ _mi_copy_no_unref(struct mi_builder *b,
 #endif
             lrm.MemoryAddress = src.addr;
          }
+#else
+         unreachable("Cannot load do mem -> reg copy on SNB and earlier");
+#endif
          break;
 
       case MI_VALUE_TYPE_REG32: