Move the pipelined register access out of intel_batchbuffer into its own utility file in preparation for replacing intel_batchbuffer. This also gives us the opportunity to refactor a few similar routines for writing registers, and so should prove useful in its own right.
Similarly there is a generic routine for storing the register values found in gen6_queryobj.c which we can transplant into the new pipelined mmio file. Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> --- src/mesa/drivers/dri/i965/Makefile.sources | 2 + src/mesa/drivers/dri/i965/brw_compute.c | 1 + src/mesa/drivers/dri/i965/brw_conditional_render.c | 1 + src/mesa/drivers/dri/i965/brw_context.h | 28 --- src/mesa/drivers/dri/i965/brw_draw.c | 1 + src/mesa/drivers/dri/i965/brw_pipelined_register.c | 253 +++++++++++++++++++++ src/mesa/drivers/dri/i965/brw_pipelined_register.h | 62 +++++ src/mesa/drivers/dri/i965/gen6_queryobj.c | 1 + src/mesa/drivers/dri/i965/gen7_sol_state.c | 1 + src/mesa/drivers/dri/i965/hsw_queryobj.c | 1 + src/mesa/drivers/dri/i965/hsw_sol.c | 1 + src/mesa/drivers/dri/i965/intel_batchbuffer.c | 227 ------------------ 12 files changed, 324 insertions(+), 255 deletions(-) create mode 100644 src/mesa/drivers/dri/i965/brw_pipelined_register.c create mode 100644 src/mesa/drivers/dri/i965/brw_pipelined_register.h diff --git a/src/mesa/drivers/dri/i965/Makefile.sources b/src/mesa/drivers/dri/i965/Makefile.sources index f38987504a..15c30bfedb 100644 --- a/src/mesa/drivers/dri/i965/Makefile.sources +++ b/src/mesa/drivers/dri/i965/Makefile.sources @@ -136,6 +136,8 @@ i965_FILES = \ brw_nir_uniforms.cpp \ brw_object_purgeable.c \ brw_pipe_control.c \ + brw_pipelined_register.c \ + brw_pipelined_register.h \ brw_program.c \ brw_program.h \ brw_program_cache.c \ diff --git a/src/mesa/drivers/dri/i965/brw_compute.c b/src/mesa/drivers/dri/i965/brw_compute.c index b2b41db2f9..208bf0fed8 100644 --- a/src/mesa/drivers/dri/i965/brw_compute.c +++ b/src/mesa/drivers/dri/i965/brw_compute.c @@ -28,6 +28,7 @@ #include "main/state.h" #include "brw_context.h" #include "brw_draw.h" +#include "brw_pipelined_register.h" #include "brw_state.h" #include "intel_buffer_objects.h" #include "brw_defines.h" diff --git a/src/mesa/drivers/dri/i965/brw_conditional_render.c b/src/mesa/drivers/dri/i965/brw_conditional_render.c index c8e5d9e3d9..ec3cdaa826 100644 --- a/src/mesa/drivers/dri/i965/brw_conditional_render.c +++ b/src/mesa/drivers/dri/i965/brw_conditional_render.c @@ -35,6 +35,7 @@ #include "brw_context.h" #include "brw_defines.h" +#include "brw_pipelined_register.h" static void set_predicate_enable(struct brw_context *brw, diff --git a/src/mesa/drivers/dri/i965/brw_context.h b/src/mesa/drivers/dri/i965/brw_context.h index 88d9a52c0a..c304a8a6da 100644 --- a/src/mesa/drivers/dri/i965/brw_context.h +++ b/src/mesa/drivers/dri/i965/brw_context.h @@ -1276,34 +1276,6 @@ void hsw_init_queryobj_functions(struct dd_function_table *functions); void brw_init_conditional_render_functions(struct dd_function_table *functions); bool brw_check_conditional_render(struct brw_context *brw); -/** intel_batchbuffer.c */ -void brw_load_register_mem(struct brw_context *brw, - uint32_t reg, - brw_bo *bo, - uint32_t read_domains, uint32_t write_domain, - uint32_t offset); -void brw_load_register_mem64(struct brw_context *brw, - uint32_t reg, - brw_bo *bo, - uint32_t read_domains, uint32_t write_domain, - uint32_t offset); -void brw_store_register_mem32(struct brw_context *brw, - brw_bo *bo, uint32_t reg, uint32_t offset); -void brw_store_register_mem64(struct brw_context *brw, - brw_bo *bo, uint32_t reg, uint32_t offset); -void brw_load_register_imm32(struct brw_context *brw, - uint32_t reg, uint32_t imm); -void brw_load_register_imm64(struct brw_context *brw, - uint32_t reg, uint64_t imm); -void brw_load_register_reg(struct brw_context *brw, uint32_t src, - uint32_t dest); -void brw_load_register_reg64(struct brw_context *brw, uint32_t src, - uint32_t dest); -void brw_store_data_imm32(struct brw_context *brw, brw_bo *bo, - uint32_t offset, uint32_t imm); -void brw_store_data_imm64(struct brw_context *brw, brw_bo *bo, - uint32_t offset, uint64_t imm); - /*====================================================================== * brw_state_dump.c */ diff --git a/src/mesa/drivers/dri/i965/brw_draw.c b/src/mesa/drivers/dri/i965/brw_draw.c index 17ef0f202e..c3f92c74cb 100644 --- a/src/mesa/drivers/dri/i965/brw_draw.c +++ b/src/mesa/drivers/dri/i965/brw_draw.c @@ -44,6 +44,7 @@ #include "brw_draw.h" #include "brw_defines.h" #include "brw_context.h" +#include "brw_pipelined_register.h" #include "brw_state.h" #include "brw_vs.h" diff --git a/src/mesa/drivers/dri/i965/brw_pipelined_register.c b/src/mesa/drivers/dri/i965/brw_pipelined_register.c new file mode 100644 index 0000000000..86ec3cd3bd --- /dev/null +++ b/src/mesa/drivers/dri/i965/brw_pipelined_register.c @@ -0,0 +1,253 @@ +/* + * Copyright © 2010-2015 Intel Corporation + * + * 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 (including the next + * paragraph) 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. + */ + +#include "brw_context.h" +#include "brw_defines.h" +#include "brw_pipelined_register.h" + +static void +load_sized_register_mem(struct brw_context *brw, + uint32_t reg, + brw_bo *bo, + uint32_t read_domains, uint32_t write_domain, + uint32_t offset, + int size) +{ + int i; + + /* MI_LOAD_REGISTER_MEM only exists on Gen7+. */ + assert(brw->gen >= 7); + + if (brw->gen >= 8) { + BEGIN_BATCH(4 * size); + for (i = 0; i < size; i++) { + OUT_BATCH(GEN7_MI_LOAD_REGISTER_MEM | (4 - 2)); + OUT_BATCH(reg + i * 4); + OUT_RELOC64(bo, read_domains, write_domain, offset + i * 4); + } + ADVANCE_BATCH(); + } else { + BEGIN_BATCH(3 * size); + for (i = 0; i < size; i++) { + OUT_BATCH(GEN7_MI_LOAD_REGISTER_MEM | (3 - 2)); + OUT_BATCH(reg + i * 4); + OUT_RELOC(bo, read_domains, write_domain, offset + i * 4); + } + ADVANCE_BATCH(); + } +} + +void +brw_load_register_mem(struct brw_context *brw, + uint32_t reg, + brw_bo *bo, + uint32_t read_domains, uint32_t write_domain, + uint32_t offset) +{ + load_sized_register_mem(brw, reg, bo, read_domains, write_domain, offset, 1); +} + +void +brw_load_register_mem64(struct brw_context *brw, + uint32_t reg, + brw_bo *bo, + uint32_t read_domains, uint32_t write_domain, + uint32_t offset) +{ + load_sized_register_mem(brw, reg, bo, read_domains, write_domain, offset, 2); +} + +/* + * Write an arbitrary 32-bit register to a buffer via MI_STORE_REGISTER_MEM. + */ +void +brw_store_register_mem32(struct brw_context *brw, + brw_bo *bo, uint32_t reg, uint32_t offset) +{ + assert(brw->gen >= 6); + + if (brw->gen >= 8) { + BEGIN_BATCH(4); + OUT_BATCH(MI_STORE_REGISTER_MEM | (4 - 2)); + OUT_BATCH(reg); + OUT_RELOC64(bo, I915_GEM_DOMAIN_INSTRUCTION, I915_GEM_DOMAIN_INSTRUCTION, + offset); + ADVANCE_BATCH(); + } else { + BEGIN_BATCH(3); + OUT_BATCH(MI_STORE_REGISTER_MEM | (3 - 2)); + OUT_BATCH(reg); + OUT_RELOC(bo, I915_GEM_DOMAIN_INSTRUCTION, I915_GEM_DOMAIN_INSTRUCTION, + offset); + ADVANCE_BATCH(); + } +} + +/* + * Write an arbitrary 64-bit register to a buffer via MI_STORE_REGISTER_MEM. + */ +void +brw_store_register_mem64(struct brw_context *brw, + brw_bo *bo, uint32_t reg, uint32_t offset) +{ + assert(brw->gen >= 6); + + /* MI_STORE_REGISTER_MEM only stores a single 32-bit value, so to + * read a full 64-bit register, we need to do two of them. + */ + if (brw->gen >= 8) { + BEGIN_BATCH(8); + OUT_BATCH(MI_STORE_REGISTER_MEM | (4 - 2)); + OUT_BATCH(reg); + OUT_RELOC64(bo, I915_GEM_DOMAIN_INSTRUCTION, I915_GEM_DOMAIN_INSTRUCTION, + offset); + OUT_BATCH(MI_STORE_REGISTER_MEM | (4 - 2)); + OUT_BATCH(reg + sizeof(uint32_t)); + OUT_RELOC64(bo, I915_GEM_DOMAIN_INSTRUCTION, I915_GEM_DOMAIN_INSTRUCTION, + offset + sizeof(uint32_t)); + ADVANCE_BATCH(); + } else { + BEGIN_BATCH(6); + OUT_BATCH(MI_STORE_REGISTER_MEM | (3 - 2)); + OUT_BATCH(reg); + OUT_RELOC(bo, I915_GEM_DOMAIN_INSTRUCTION, I915_GEM_DOMAIN_INSTRUCTION, + offset); + OUT_BATCH(MI_STORE_REGISTER_MEM | (3 - 2)); + OUT_BATCH(reg + sizeof(uint32_t)); + OUT_RELOC(bo, I915_GEM_DOMAIN_INSTRUCTION, I915_GEM_DOMAIN_INSTRUCTION, + offset + sizeof(uint32_t)); + ADVANCE_BATCH(); + } +} + +/* + * Write a 32-bit register using immediate data. + */ +void +brw_load_register_imm32(struct brw_context *brw, uint32_t reg, uint32_t imm) +{ + assert(brw->gen >= 6); + + BEGIN_BATCH(3); + OUT_BATCH(MI_LOAD_REGISTER_IMM | (3 - 2)); + OUT_BATCH(reg); + OUT_BATCH(imm); + ADVANCE_BATCH(); +} + +/* + * Write a 64-bit register using immediate data. + */ +void +brw_load_register_imm64(struct brw_context *brw, uint32_t reg, uint64_t imm) +{ + assert(brw->gen >= 6); + + BEGIN_BATCH(5); + OUT_BATCH(MI_LOAD_REGISTER_IMM | (5 - 2)); + OUT_BATCH(reg); + OUT_BATCH(imm & 0xffffffff); + OUT_BATCH(reg + 4); + OUT_BATCH(imm >> 32); + ADVANCE_BATCH(); +} + +/* + * Copies a 32-bit register. + */ +void +brw_load_register_reg(struct brw_context *brw, uint32_t src, uint32_t dest) +{ + assert(brw->gen >= 8 || brw->is_haswell); + + BEGIN_BATCH(3); + OUT_BATCH(MI_LOAD_REGISTER_REG | (3 - 2)); + OUT_BATCH(src); + OUT_BATCH(dest); + ADVANCE_BATCH(); +} + +/* + * Copies a 64-bit register. + */ +void +brw_load_register_reg64(struct brw_context *brw, uint32_t src, uint32_t dest) +{ + assert(brw->gen >= 8 || brw->is_haswell); + + BEGIN_BATCH(6); + OUT_BATCH(MI_LOAD_REGISTER_REG | (3 - 2)); + OUT_BATCH(src); + OUT_BATCH(dest); + OUT_BATCH(MI_LOAD_REGISTER_REG | (3 - 2)); + OUT_BATCH(src + sizeof(uint32_t)); + OUT_BATCH(dest + sizeof(uint32_t)); + ADVANCE_BATCH(); +} + +/* + * Write 32-bits of immediate data to a GPU memory buffer. + */ +void +brw_store_data_imm32(struct brw_context *brw, brw_bo *bo, + uint32_t offset, uint32_t imm) +{ + assert(brw->gen >= 6); + + BEGIN_BATCH(4); + OUT_BATCH(MI_STORE_DATA_IMM | (4 - 2)); + if (brw->gen >= 8) + OUT_RELOC64(bo, I915_GEM_DOMAIN_INSTRUCTION, I915_GEM_DOMAIN_INSTRUCTION, + offset); + else { + OUT_BATCH(0); /* MBZ */ + OUT_RELOC(bo, I915_GEM_DOMAIN_INSTRUCTION, I915_GEM_DOMAIN_INSTRUCTION, + offset); + } + OUT_BATCH(imm); + ADVANCE_BATCH(); +} + +/* + * Write 64-bits of immediate data to a GPU memory buffer. + */ +void +brw_store_data_imm64(struct brw_context *brw, brw_bo *bo, + uint32_t offset, uint64_t imm) +{ + assert(brw->gen >= 6); + + BEGIN_BATCH(5); + OUT_BATCH(MI_STORE_DATA_IMM | (5 - 2)); + if (brw->gen >= 8) + OUT_RELOC64(bo, I915_GEM_DOMAIN_INSTRUCTION, I915_GEM_DOMAIN_INSTRUCTION, + offset); + else { + OUT_BATCH(0); /* MBZ */ + OUT_RELOC(bo, I915_GEM_DOMAIN_INSTRUCTION, I915_GEM_DOMAIN_INSTRUCTION, + offset); + } + OUT_BATCH(imm & 0xffffffffu); + OUT_BATCH(imm >> 32); + ADVANCE_BATCH(); +} diff --git a/src/mesa/drivers/dri/i965/brw_pipelined_register.h b/src/mesa/drivers/dri/i965/brw_pipelined_register.h new file mode 100644 index 0000000000..208654c2e5 --- /dev/null +++ b/src/mesa/drivers/dri/i965/brw_pipelined_register.h @@ -0,0 +1,62 @@ +/* + * Copyright © 2010-2015 Intel Corporation + * + * 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 (including the next + * paragraph) 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. + */ + +#ifndef BRW_PIPELINED_REGISTER_H +#define BRW_PIPELINED_REGISTER_H + +#ifdef __cplusplus +extern "C" { +#endif + +void brw_load_register_mem(struct brw_context *brw, + uint32_t reg, + brw_bo *bo, + uint32_t read_domains, uint32_t write_domain, + uint32_t offset); +void brw_load_register_mem64(struct brw_context *brw, + uint32_t reg, + brw_bo *bo, + uint32_t read_domains, uint32_t write_domain, + uint32_t offset); +void brw_store_register_mem32(struct brw_context *brw, + brw_bo *bo, uint32_t reg, uint32_t offset); +void brw_store_register_mem64(struct brw_context *brw, + brw_bo *bo, uint32_t reg, uint32_t offset); +void brw_load_register_imm32(struct brw_context *brw, + uint32_t reg, uint32_t imm); +void brw_load_register_imm64(struct brw_context *brw, + uint32_t reg, uint64_t imm); +void brw_load_register_reg(struct brw_context *brw, uint32_t src, + uint32_t dest); +void brw_load_register_reg64(struct brw_context *brw, uint32_t src, + uint32_t dest); +void brw_store_data_imm32(struct brw_context *brw, brw_bo *bo, + uint32_t offset, uint32_t imm); +void brw_store_data_imm64(struct brw_context *brw, brw_bo *bo, + uint32_t offset, uint64_t imm); + +#ifdef __cplusplus +} +#endif + +#endif /* BRW_PIPELINED_REGISTER_H */ diff --git a/src/mesa/drivers/dri/i965/gen6_queryobj.c b/src/mesa/drivers/dri/i965/gen6_queryobj.c index 50a9be0e78..732cba8c92 100644 --- a/src/mesa/drivers/dri/i965/gen6_queryobj.c +++ b/src/mesa/drivers/dri/i965/gen6_queryobj.c @@ -35,6 +35,7 @@ #include "brw_context.h" #include "brw_defines.h" +#include "brw_pipelined_register.h" #include "brw_state.h" #include "intel_buffer_objects.h" diff --git a/src/mesa/drivers/dri/i965/gen7_sol_state.c b/src/mesa/drivers/dri/i965/gen7_sol_state.c index d091eb6cec..595b1c703d 100644 --- a/src/mesa/drivers/dri/i965/gen7_sol_state.c +++ b/src/mesa/drivers/dri/i965/gen7_sol_state.c @@ -31,6 +31,7 @@ #include "brw_context.h" #include "brw_state.h" #include "brw_defines.h" +#include "brw_pipelined_register.h" #include "intel_buffer_objects.h" #include "main/transformfeedback.h" diff --git a/src/mesa/drivers/dri/i965/hsw_queryobj.c b/src/mesa/drivers/dri/i965/hsw_queryobj.c index 2b771a213c..f1df562774 100644 --- a/src/mesa/drivers/dri/i965/hsw_queryobj.c +++ b/src/mesa/drivers/dri/i965/hsw_queryobj.c @@ -30,6 +30,7 @@ #include "brw_context.h" #include "brw_defines.h" +#include "brw_pipelined_register.h" #include "intel_buffer_objects.h" /* diff --git a/src/mesa/drivers/dri/i965/hsw_sol.c b/src/mesa/drivers/dri/i965/hsw_sol.c index 588842e5cd..5b2fd6b5c6 100644 --- a/src/mesa/drivers/dri/i965/hsw_sol.c +++ b/src/mesa/drivers/dri/i965/hsw_sol.c @@ -31,6 +31,7 @@ #include "brw_context.h" #include "brw_state.h" #include "brw_defines.h" +#include "brw_pipelined_register.h" #include "intel_buffer_objects.h" #include "main/transformfeedback.h" diff --git a/src/mesa/drivers/dri/i965/intel_batchbuffer.c b/src/mesa/drivers/dri/i965/intel_batchbuffer.c index 2bf9583172..a967351381 100644 --- a/src/mesa/drivers/dri/i965/intel_batchbuffer.c +++ b/src/mesa/drivers/dri/i965/intel_batchbuffer.c @@ -479,230 +479,3 @@ intel_batchbuffer_data(struct brw_context *brw, memcpy(brw->batch.map_next, data, bytes); brw->batch.map_next += bytes >> 2; } - -static void -load_sized_register_mem(struct brw_context *brw, - uint32_t reg, - brw_bo *bo, - uint32_t read_domains, uint32_t write_domain, - uint32_t offset, - int size) -{ - int i; - - /* MI_LOAD_REGISTER_MEM only exists on Gen7+. */ - assert(brw->gen >= 7); - - if (brw->gen >= 8) { - BEGIN_BATCH(4 * size); - for (i = 0; i < size; i++) { - OUT_BATCH(GEN7_MI_LOAD_REGISTER_MEM | (4 - 2)); - OUT_BATCH(reg + i * 4); - OUT_RELOC64(bo, read_domains, write_domain, offset + i * 4); - } - ADVANCE_BATCH(); - } else { - BEGIN_BATCH(3 * size); - for (i = 0; i < size; i++) { - OUT_BATCH(GEN7_MI_LOAD_REGISTER_MEM | (3 - 2)); - OUT_BATCH(reg + i * 4); - OUT_RELOC(bo, read_domains, write_domain, offset + i * 4); - } - ADVANCE_BATCH(); - } -} - -void -brw_load_register_mem(struct brw_context *brw, - uint32_t reg, - brw_bo *bo, - uint32_t read_domains, uint32_t write_domain, - uint32_t offset) -{ - load_sized_register_mem(brw, reg, bo, read_domains, write_domain, offset, 1); -} - -void -brw_load_register_mem64(struct brw_context *brw, - uint32_t reg, - brw_bo *bo, - uint32_t read_domains, uint32_t write_domain, - uint32_t offset) -{ - load_sized_register_mem(brw, reg, bo, read_domains, write_domain, offset, 2); -} - -/* - * Write an arbitrary 32-bit register to a buffer via MI_STORE_REGISTER_MEM. - */ -void -brw_store_register_mem32(struct brw_context *brw, - brw_bo *bo, uint32_t reg, uint32_t offset) -{ - assert(brw->gen >= 6); - - if (brw->gen >= 8) { - BEGIN_BATCH(4); - OUT_BATCH(MI_STORE_REGISTER_MEM | (4 - 2)); - OUT_BATCH(reg); - OUT_RELOC64(bo, I915_GEM_DOMAIN_INSTRUCTION, I915_GEM_DOMAIN_INSTRUCTION, - offset); - ADVANCE_BATCH(); - } else { - BEGIN_BATCH(3); - OUT_BATCH(MI_STORE_REGISTER_MEM | (3 - 2)); - OUT_BATCH(reg); - OUT_RELOC(bo, I915_GEM_DOMAIN_INSTRUCTION, I915_GEM_DOMAIN_INSTRUCTION, - offset); - ADVANCE_BATCH(); - } -} - -/* - * Write an arbitrary 64-bit register to a buffer via MI_STORE_REGISTER_MEM. - */ -void -brw_store_register_mem64(struct brw_context *brw, - brw_bo *bo, uint32_t reg, uint32_t offset) -{ - assert(brw->gen >= 6); - - /* MI_STORE_REGISTER_MEM only stores a single 32-bit value, so to - * read a full 64-bit register, we need to do two of them. - */ - if (brw->gen >= 8) { - BEGIN_BATCH(8); - OUT_BATCH(MI_STORE_REGISTER_MEM | (4 - 2)); - OUT_BATCH(reg); - OUT_RELOC64(bo, I915_GEM_DOMAIN_INSTRUCTION, I915_GEM_DOMAIN_INSTRUCTION, - offset); - OUT_BATCH(MI_STORE_REGISTER_MEM | (4 - 2)); - OUT_BATCH(reg + sizeof(uint32_t)); - OUT_RELOC64(bo, I915_GEM_DOMAIN_INSTRUCTION, I915_GEM_DOMAIN_INSTRUCTION, - offset + sizeof(uint32_t)); - ADVANCE_BATCH(); - } else { - BEGIN_BATCH(6); - OUT_BATCH(MI_STORE_REGISTER_MEM | (3 - 2)); - OUT_BATCH(reg); - OUT_RELOC(bo, I915_GEM_DOMAIN_INSTRUCTION, I915_GEM_DOMAIN_INSTRUCTION, - offset); - OUT_BATCH(MI_STORE_REGISTER_MEM | (3 - 2)); - OUT_BATCH(reg + sizeof(uint32_t)); - OUT_RELOC(bo, I915_GEM_DOMAIN_INSTRUCTION, I915_GEM_DOMAIN_INSTRUCTION, - offset + sizeof(uint32_t)); - ADVANCE_BATCH(); - } -} - -/* - * Write a 32-bit register using immediate data. - */ -void -brw_load_register_imm32(struct brw_context *brw, uint32_t reg, uint32_t imm) -{ - assert(brw->gen >= 6); - - BEGIN_BATCH(3); - OUT_BATCH(MI_LOAD_REGISTER_IMM | (3 - 2)); - OUT_BATCH(reg); - OUT_BATCH(imm); - ADVANCE_BATCH(); -} - -/* - * Write a 64-bit register using immediate data. - */ -void -brw_load_register_imm64(struct brw_context *brw, uint32_t reg, uint64_t imm) -{ - assert(brw->gen >= 6); - - BEGIN_BATCH(5); - OUT_BATCH(MI_LOAD_REGISTER_IMM | (5 - 2)); - OUT_BATCH(reg); - OUT_BATCH(imm & 0xffffffff); - OUT_BATCH(reg + 4); - OUT_BATCH(imm >> 32); - ADVANCE_BATCH(); -} - -/* - * Copies a 32-bit register. - */ -void -brw_load_register_reg(struct brw_context *brw, uint32_t src, uint32_t dest) -{ - assert(brw->gen >= 8 || brw->is_haswell); - - BEGIN_BATCH(3); - OUT_BATCH(MI_LOAD_REGISTER_REG | (3 - 2)); - OUT_BATCH(src); - OUT_BATCH(dest); - ADVANCE_BATCH(); -} - -/* - * Copies a 64-bit register. - */ -void -brw_load_register_reg64(struct brw_context *brw, uint32_t src, uint32_t dest) -{ - assert(brw->gen >= 8 || brw->is_haswell); - - BEGIN_BATCH(6); - OUT_BATCH(MI_LOAD_REGISTER_REG | (3 - 2)); - OUT_BATCH(src); - OUT_BATCH(dest); - OUT_BATCH(MI_LOAD_REGISTER_REG | (3 - 2)); - OUT_BATCH(src + sizeof(uint32_t)); - OUT_BATCH(dest + sizeof(uint32_t)); - ADVANCE_BATCH(); -} - -/* - * Write 32-bits of immediate data to a GPU memory buffer. - */ -void -brw_store_data_imm32(struct brw_context *brw, brw_bo *bo, - uint32_t offset, uint32_t imm) -{ - assert(brw->gen >= 6); - - BEGIN_BATCH(4); - OUT_BATCH(MI_STORE_DATA_IMM | (4 - 2)); - if (brw->gen >= 8) - OUT_RELOC64(bo, I915_GEM_DOMAIN_INSTRUCTION, I915_GEM_DOMAIN_INSTRUCTION, - offset); - else { - OUT_BATCH(0); /* MBZ */ - OUT_RELOC(bo, I915_GEM_DOMAIN_INSTRUCTION, I915_GEM_DOMAIN_INSTRUCTION, - offset); - } - OUT_BATCH(imm); - ADVANCE_BATCH(); -} - -/* - * Write 64-bits of immediate data to a GPU memory buffer. - */ -void -brw_store_data_imm64(struct brw_context *brw, brw_bo *bo, - uint32_t offset, uint64_t imm) -{ - assert(brw->gen >= 6); - - BEGIN_BATCH(5); - OUT_BATCH(MI_STORE_DATA_IMM | (5 - 2)); - if (brw->gen >= 8) - OUT_RELOC64(bo, I915_GEM_DOMAIN_INSTRUCTION, I915_GEM_DOMAIN_INSTRUCTION, - offset); - else { - OUT_BATCH(0); /* MBZ */ - OUT_RELOC(bo, I915_GEM_DOMAIN_INSTRUCTION, I915_GEM_DOMAIN_INSTRUCTION, - offset); - } - OUT_BATCH(imm & 0xffffffffu); - OUT_BATCH(imm >> 32); - ADVANCE_BATCH(); -} -- 2.11.0 _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev