ilo: move MI functions to ilo_builder_mi.h

Have a centralized place for MI functions, and remove the duplicated
gen6_MI_LOAD_REGISTER_IMM().

src/gallium/drivers/ilo/Makefile.sources

@@ -17,6 +17,7 @@ C_SOURCES := \
 	ilo_builder.c \
 	ilo_builder.h \
 	ilo_builder_decode.c \
+	ilo_builder_mi.h \
 	ilo_common.h \
 	ilo_context.c \
 	ilo_context.h \

src/gallium/drivers/ilo/ilo_3d_pipeline_gen6.c

@@ -29,8 +29,9 @@
 #include "util/u_dual_blend.h"
 #include "util/u_prim.h"
 
-#include "ilo_blitter.h"
 #include "ilo_3d.h"
+#include "ilo_blitter.h"
+#include "ilo_builder_mi.h"
 #include "ilo_context.h"
 #include "ilo_cp.h"
 #include "ilo_gpe_gen6.h"

src/gallium/drivers/ilo/ilo_blitter_blt.c

@@ -29,6 +29,7 @@
 #include "util/u_pack_color.h"
 
 #include "ilo_3d.h"
+#include "ilo_builder_mi.h"
 #include "ilo_context.h"
 #include "ilo_cp.h"
 #include "ilo_blit.h"
@@ -56,34 +57,6 @@ enum gen6_blt_mask {
 static const int gen6_max_bytes_per_scanline = 32768;
 static const int gen6_max_scanlines = 65536;
 
-static void
-gen6_MI_FLUSH_DW(struct ilo_builder *builder)
-{
-   const uint8_t cmd_len = 4;
-   const uint32_t dw0 = GEN6_MI_CMD(MI_FLUSH_DW) | (cmd_len - 2);
-   uint32_t *dw;
-
-   ilo_builder_batch_pointer(builder, cmd_len, &dw);
-   dw[0] = dw0;
-   dw[1] = 0;
-   dw[2] = 0;
-   dw[3] = 0;
-}
-
-static void
-gen6_MI_LOAD_REGISTER_IMM(struct ilo_builder *builder,
-                          uint32_t reg, uint32_t val)
-{
-   const uint8_t cmd_len = 3;
-   const uint32_t dw0 = GEN6_MI_CMD(MI_LOAD_REGISTER_IMM) | (cmd_len - 2);
-   uint32_t *dw;
-
-   ilo_builder_batch_pointer(builder, cmd_len, &dw);
-   dw[0] = dw0;
-   dw[1] = reg;
-   dw[2] = val;
-}
-
 static uint32_t
 gen6_translate_blt_value_mask(enum gen6_blt_mask value_mask)
 {

src/gallium/drivers/ilo/ilo_builder.c

@@ -538,29 +538,3 @@ ilo_builder_batch_state_base_address(struct ilo_builder *builder,
    dw[8] = 0xfffff000 + init_all;
    dw[9] = init_all;
 }
-
-/**
- * Add a MI_BATCH_BUFFER_END to the batch buffer.  Pad if necessary.
- */
-void
-ilo_builder_batch_mi_batch_buffer_end(struct ilo_builder *builder)
-{
-   const struct ilo_builder_writer *bat =
-      &builder->writers[ILO_BUILDER_WRITER_BATCH];
-   uint32_t *dw;
-
-   /*
-    * From the Sandy Bridge PRM, volume 1 part 1, page 107:
-    *
-    *     "The batch buffer must be QWord aligned and a multiple of QWords in
-    *      length."
-    */
-   if (bat->used & 0x7) {
-      ilo_builder_batch_pointer(builder, 1, &dw);
-      dw[0] = GEN6_MI_CMD(MI_BATCH_BUFFER_END);
-   } else {
-      ilo_builder_batch_pointer(builder, 2, &dw);
-      dw[0] = GEN6_MI_CMD(MI_BATCH_BUFFER_END);
-      dw[1] = GEN6_MI_CMD(MI_NOOP);
-   }
-}

src/gallium/drivers/ilo/ilo_builder.h

@@ -484,7 +484,4 @@ void
 ilo_builder_batch_state_base_address(struct ilo_builder *builder,
                                      bool init_all);
 
-void
-ilo_builder_batch_mi_batch_buffer_end(struct ilo_builder *builder);
-
 #endif /* ILO_BUILDER_H */

src/gallium/drivers/ilo/ilo_builder_mi.h

@@ -0,0 +1,187 @@
+/*
+ * Mesa 3-D graphics library
+ *
+ * Copyright (C) 2014 LunarG, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Chia-I Wu <olv@lunarg.com>
+ */
+
+#ifndef ILO_BUILDER_MI_H
+#define ILO_BUILDER_MI_H
+
+#include "genhw/genhw.h"
+#include "intel_winsys.h"
+
+#include "ilo_common.h"
+#include "ilo_builder.h"
+
+static inline void
+gen6_MI_STORE_DATA_IMM(struct ilo_builder *builder,
+                       struct intel_bo *bo, uint32_t bo_offset,
+                       uint64_t val, bool store_qword)
+{
+   const uint8_t cmd_len = (store_qword) ? 5 : 4;
+   uint32_t dw0 = GEN6_MI_CMD(MI_STORE_DATA_IMM) | (cmd_len - 2);
+   uint32_t reloc_flags = INTEL_RELOC_WRITE;
+   unsigned pos;
+   uint32_t *dw;
+
+   ILO_DEV_ASSERT(builder->dev, 6, 7.5);
+
+   assert(bo_offset % ((store_qword) ? 8 : 4) == 0);
+
+   /* must use GGTT on GEN6 as in PIPE_CONTROL */
+   if (ilo_dev_gen(builder->dev) == ILO_GEN(6)) {
+      dw0 |= GEN6_MI_STORE_DATA_IMM_DW0_USE_GGTT;
+      reloc_flags |= INTEL_RELOC_GGTT;
+   }
+
+   pos = ilo_builder_batch_pointer(builder, cmd_len, &dw);
+   dw[0] = dw0;
+   dw[1] = 0;
+   dw[3] = (uint32_t) val;
+   if (store_qword)
+      dw[4] = (uint32_t) (val >> 32);
+   else
+      assert(val == (uint64_t) ((uint32_t) val));
+
+   ilo_builder_batch_reloc(builder, pos + 2,
+         bo, bo_offset, reloc_flags);
+}
+
+static inline void
+gen6_MI_LOAD_REGISTER_IMM(struct ilo_builder *builder,
+                          uint32_t reg, uint32_t val)
+{
+   const uint8_t cmd_len = 3;
+   const uint32_t dw0 = GEN6_MI_CMD(MI_LOAD_REGISTER_IMM) | (cmd_len - 2);
+   uint32_t *dw;
+
+   ILO_DEV_ASSERT(builder->dev, 6, 7.5);
+
+   assert(reg % 4 == 0);
+
+   ilo_builder_batch_pointer(builder, cmd_len, &dw);
+   dw[0] = dw0;
+   dw[1] = reg;
+   dw[2] = val;
+}
+
+static inline void
+gen6_MI_STORE_REGISTER_MEM(struct ilo_builder *builder,
+                           struct intel_bo *bo, uint32_t bo_offset,
+                           uint32_t reg)
+{
+   const uint8_t cmd_len = 3;
+   uint32_t dw0 = GEN6_MI_CMD(MI_STORE_REGISTER_MEM) | (cmd_len - 2);
+   uint32_t reloc_flags = INTEL_RELOC_WRITE;
+   unsigned pos;
+   uint32_t *dw;
+
+   ILO_DEV_ASSERT(builder->dev, 6, 7.5);
+
+   assert(reg % 4 == 0 && bo_offset % 4 == 0);
+
+   /* must use GGTT on GEN6 as in PIPE_CONTROL */
+   if (ilo_dev_gen(builder->dev) == ILO_GEN(6)) {
+      dw0 |= GEN6_MI_STORE_REGISTER_MEM_DW0_USE_GGTT;
+      reloc_flags |= INTEL_RELOC_GGTT;
+   }
+
+   pos = ilo_builder_batch_pointer(builder, cmd_len, &dw);
+   dw[0] = dw0;
+   dw[1] = reg;
+
+   ilo_builder_batch_reloc(builder, pos + 2,
+         bo, bo_offset, reloc_flags);
+}
+
+static inline void
+gen6_MI_FLUSH_DW(struct ilo_builder *builder)
+{
+   const uint8_t cmd_len = 4;
+   const uint32_t dw0 = GEN6_MI_CMD(MI_FLUSH_DW) | (cmd_len - 2);
+   uint32_t *dw;
+
+   ilo_builder_batch_pointer(builder, cmd_len, &dw);
+   dw[0] = dw0;
+   dw[1] = 0;
+   dw[2] = 0;
+   dw[3] = 0;
+}
+
+static inline void
+gen6_MI_REPORT_PERF_COUNT(struct ilo_builder *builder,
+                          struct intel_bo *bo, uint32_t bo_offset,
+                          uint32_t report_id)
+{
+   const uint8_t cmd_len = 3;
+   const uint32_t dw0 = GEN6_MI_CMD(MI_REPORT_PERF_COUNT) | (cmd_len - 2);
+   uint32_t reloc_flags = INTEL_RELOC_WRITE;
+   unsigned pos;
+   uint32_t *dw;
+
+   ILO_DEV_ASSERT(builder->dev, 6, 7.5);
+
+   assert(bo_offset % 64 == 0);
+
+   /* must use GGTT on GEN6 as in PIPE_CONTROL */
+   if (ilo_dev_gen(builder->dev) == ILO_GEN(6)) {
+      bo_offset |= GEN6_MI_REPORT_PERF_COUNT_DW1_USE_GGTT;
+      reloc_flags |= INTEL_RELOC_GGTT;
+   }
+
+   pos = ilo_builder_batch_pointer(builder, cmd_len, &dw);
+   dw[0] = dw0;
+   dw[2] = report_id;
+
+   ilo_builder_batch_reloc(builder, pos + 1,
+         bo, bo_offset, reloc_flags);
+}
+
+/**
+ * Add a MI_BATCH_BUFFER_END to the batch buffer.  Pad if necessary.
+ */
+static inline void
+ilo_builder_batch_mi_batch_buffer_end(struct ilo_builder *builder)
+{
+   const struct ilo_builder_writer *bat =
+      &builder->writers[ILO_BUILDER_WRITER_BATCH];
+   uint32_t *dw;
+
+   /*
+    * From the Sandy Bridge PRM, volume 1 part 1, page 107:
+    *
+    *     "The batch buffer must be QWord aligned and a multiple of QWords in
+    *      length."
+    */
+   if (bat->used & 0x7) {
+      ilo_builder_batch_pointer(builder, 1, &dw);
+      dw[0] = GEN6_MI_CMD(MI_BATCH_BUFFER_END);
+   } else {
+      ilo_builder_batch_pointer(builder, 2, &dw);
+      dw[0] = GEN6_MI_CMD(MI_BATCH_BUFFER_END);
+      dw[1] = GEN6_MI_CMD(MI_NOOP);
+   }
+}
+
+#endif /* ILO_BUILDER_MI_H */

src/gallium/drivers/ilo/ilo_cp.c

@@ -27,6 +27,7 @@
 
 #include "intel_winsys.h"
 
+#include "ilo_builder_mi.h"
 #include "ilo_shader.h"
 #include "ilo_cp.h"
 

src/gallium/drivers/ilo/ilo_gpe_gen6.h

@@ -235,116 +235,6 @@ ilo_gpe_gen6_fill_3dstate_sf_sbe(const struct ilo_dev_info *dev,
    dw[12] = 0;
 }
 
-static inline void
-gen6_MI_STORE_DATA_IMM(struct ilo_builder *builder,
-                       struct intel_bo *bo, uint32_t bo_offset,
-                       uint64_t val, bool store_qword)
-{
-   const uint8_t cmd_len = (store_qword) ? 5 : 4;
-   uint32_t dw0 = GEN6_MI_CMD(MI_STORE_DATA_IMM) | (cmd_len - 2);
-   uint32_t reloc_flags = INTEL_RELOC_WRITE;
-   unsigned pos;
-   uint32_t *dw;
-
-   ILO_DEV_ASSERT(builder->dev, 6, 7.5);
-
-   assert(bo_offset % ((store_qword) ? 8 : 4) == 0);
-
-   /* must use GGTT on GEN6 as in PIPE_CONTROL */
-   if (ilo_dev_gen(builder->dev) == ILO_GEN(6)) {
-      dw0 |= GEN6_MI_STORE_DATA_IMM_DW0_USE_GGTT;
-      reloc_flags |= INTEL_RELOC_GGTT;
-   }
-
-   pos = ilo_builder_batch_pointer(builder, cmd_len, &dw);
-   dw[0] = dw0;
-   dw[1] = 0;
-   dw[3] = (uint32_t) val;
-   if (store_qword)
-      dw[4] = (uint32_t) (val >> 32);
-   else
-      assert(val == (uint64_t) ((uint32_t) val));
-
-   ilo_builder_batch_reloc(builder, pos + 2,
-         bo, bo_offset, reloc_flags);
-}
-
-static inline void
-gen6_MI_LOAD_REGISTER_IMM(struct ilo_builder *builder,
-                          uint32_t reg, uint32_t val)
-{
-   const uint8_t cmd_len = 3;
-   const uint32_t dw0 = GEN6_MI_CMD(MI_LOAD_REGISTER_IMM) | (cmd_len - 2);
-   uint32_t *dw;
-
-   ILO_DEV_ASSERT(builder->dev, 6, 7.5);
-
-   assert(reg % 4 == 0);
-
-   ilo_builder_batch_pointer(builder, cmd_len, &dw);
-   dw[0] = dw0;
-   dw[1] = reg;
-   dw[2] = val;
-}
-
-static inline void
-gen6_MI_STORE_REGISTER_MEM(struct ilo_builder *builder,
-                           struct intel_bo *bo, uint32_t bo_offset,
-                           uint32_t reg)
-{
-   const uint8_t cmd_len = 3;
-   uint32_t dw0 = GEN6_MI_CMD(MI_STORE_REGISTER_MEM) | (cmd_len - 2);
-   uint32_t reloc_flags = INTEL_RELOC_WRITE;
-   unsigned pos;
-   uint32_t *dw;
-
-   ILO_DEV_ASSERT(builder->dev, 6, 7.5);
-
-   assert(reg % 4 == 0 && bo_offset % 4 == 0);
-
-   /* must use GGTT on GEN6 as in PIPE_CONTROL */
-   if (ilo_dev_gen(builder->dev) == ILO_GEN(6)) {
-      dw0 |= GEN6_MI_STORE_REGISTER_MEM_DW0_USE_GGTT;
-      reloc_flags |= INTEL_RELOC_GGTT;
-   }
-
-   pos = ilo_builder_batch_pointer(builder, cmd_len, &dw);
-   dw[0] = dw0;
-   dw[1] = reg;
-
-   ilo_builder_batch_reloc(builder, pos + 2,
-         bo, bo_offset, reloc_flags);
-}
-
-static inline void
-gen6_MI_REPORT_PERF_COUNT(struct ilo_builder *builder,
-                          struct intel_bo *bo, uint32_t bo_offset,
-                          uint32_t report_id)
-{
-   const uint8_t cmd_len = 3;
-   const uint32_t dw0 = GEN6_MI_CMD(MI_REPORT_PERF_COUNT) | (cmd_len - 2);
-   uint32_t reloc_flags = INTEL_RELOC_WRITE;
-   unsigned pos;
-   uint32_t *dw;
-
-   ILO_DEV_ASSERT(builder->dev, 6, 7.5);
-
-   assert(bo_offset % 64 == 0);
-
-   /* must use GGTT on GEN6 as in PIPE_CONTROL */
-   if (ilo_dev_gen(builder->dev) == ILO_GEN(6)) {
-      bo_offset |= GEN6_MI_REPORT_PERF_COUNT_DW1_USE_GGTT;
-      reloc_flags |= INTEL_RELOC_GGTT;
-   }
-
-   pos = ilo_builder_batch_pointer(builder, cmd_len, &dw);
-   dw[0] = dw0;
-   dw[2] = report_id;
-
-   ilo_builder_batch_reloc(builder, pos + 1,
-         bo, bo_offset, reloc_flags);
-}
-
 static inline void
 gen6_STATE_BASE_ADDRESS(struct ilo_builder *builder,
                         struct intel_bo *general_state_bo,