[Mesa-dev] [PATCH 09/20] intel/aub_write: factorize context image/pphwsp/ring creation
Lionel Landwerlin
lionel.g.landwerlin at intel.com
Tue Sep 25 08:23:48 UTC 2018
We allocate GGTT entries and physical addresses are we create engines
rather than having a fixed layout.
Context images now receive a parameter argument which is used to setup
pml4 & ring buffer addresses.
Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
---
src/intel/tools/aub_write.c | 240 +++++++++++++++-----------------
src/intel/tools/aub_write.h | 6 +
src/intel/tools/gen10_context.h | 33 +++--
src/intel/tools/gen8_context.h | 33 +++--
src/intel/tools/gen_context.h | 27 ++--
5 files changed, 161 insertions(+), 178 deletions(-)
diff --git a/src/intel/tools/aub_write.c b/src/intel/tools/aub_write.c
index b51a1069d96..fe759a40204 100644
--- a/src/intel/tools/aub_write.c
+++ b/src/intel/tools/aub_write.c
@@ -355,17 +355,70 @@ ppgtt_lookup(struct aub_file *aub, uint64_t ppgtt_addr)
return (uint64_t)L1_table(ppgtt_addr)->subtables[L1_index(ppgtt_addr)];
}
-static uint32_t *
+static const struct engine {
+ const char *name;
+ enum drm_i915_gem_engine_class engine_class;
+ uint32_t hw_class;
+ uint32_t elsp_reg;
+ uint32_t elsq_reg;
+ uint32_t status_reg;
+ uint32_t control_reg;
+} engines[] = {
+ [I915_ENGINE_CLASS_RENDER] = {
+ .name = "RENDER",
+ .engine_class = I915_ENGINE_CLASS_RENDER,
+ .hw_class = 1,
+ .elsp_reg = EXECLIST_SUBMITPORT_RCSUNIT,
+ .elsq_reg = EXECLIST_SQ_CONTENTS0_RCSUNIT,
+ .status_reg = EXECLIST_STATUS_RCSUNIT,
+ .control_reg = EXECLIST_CONTROL_RCSUNIT,
+ },
+ [I915_ENGINE_CLASS_VIDEO] = {
+ .name = "VIDEO",
+ .engine_class = I915_ENGINE_CLASS_VIDEO,
+ .hw_class = 3,
+ .elsp_reg = EXECLIST_SUBMITPORT_VCSUNIT0,
+ .elsq_reg = EXECLIST_SQ_CONTENTS0_VCSUNIT0,
+ .status_reg = EXECLIST_STATUS_VCSUNIT0,
+ .control_reg = EXECLIST_CONTROL_VCSUNIT0,
+ },
+ [I915_ENGINE_CLASS_COPY] = {
+ .name = "BLITTER",
+ .engine_class = I915_ENGINE_CLASS_COPY,
+ .hw_class = 2,
+ .elsp_reg = EXECLIST_SUBMITPORT_BCSUNIT,
+ .elsq_reg = EXECLIST_SQ_CONTENTS0_BCSUNIT,
+ .status_reg = EXECLIST_STATUS_BCSUNIT,
+ .control_reg = EXECLIST_CONTROL_BCSUNIT,
+ },
+};
+
+static const struct engine *
+engine_from_ring_flag(enum drm_i915_gem_engine_class engine_class)
+{
+ switch (engine_class) {
+ case I915_ENGINE_CLASS_RENDER:
+ case I915_ENGINE_CLASS_COPY:
+ case I915_ENGINE_CLASS_VIDEO:
+ return &engines[engine_class];
+ default:
+ unreachable("unknown ring");
+ }
+}
+
+static void
get_context_init(const struct gen_device_info *devinfo,
+ const struct gen_context_parameters *params,
enum drm_i915_gem_engine_class engine_class,
+ uint32_t *data,
uint32_t *size)
{
- static void (* const gen8_contexts[])(uint32_t *, uint32_t *) = {
+ static const gen_context_init_t gen8_contexts[] = {
[I915_ENGINE_CLASS_RENDER] = gen8_render_context_init,
[I915_ENGINE_CLASS_COPY] = gen8_blitter_context_init,
[I915_ENGINE_CLASS_VIDEO] = gen8_video_context_init,
};
- static void (* const gen10_contexts[])(uint32_t *, uint32_t *) = {
+ static const gen_context_init_t gen10_contexts[] = {
[I915_ENGINE_CLASS_RENDER] = gen10_render_context_init,
[I915_ENGINE_CLASS_COPY] = gen10_blitter_context_init,
[I915_ENGINE_CLASS_VIDEO] = gen10_video_context_init,
@@ -373,104 +426,85 @@ get_context_init(const struct gen_device_info *devinfo,
assert(devinfo->gen >= 8);
- void (*func)(uint32_t *, uint32_t *);
if (devinfo->gen <= 10)
- func = gen8_contexts[engine_class];
+ gen8_contexts[engine_class](params, data, size);
else
- func = gen10_contexts[engine_class];
-
- func(NULL, size);
- uint32_t *data = calloc(*size / sizeof(uint32_t), sizeof(uint32_t));
- func(data, size);
- return data;
+ gen10_contexts[engine_class](params, data, size);
}
-static void
-write_execlists_default_setup(struct aub_file *aub)
+static uint32_t
+write_engine_execlist_setup(struct aub_file *aub,
+ enum drm_i915_gem_engine_class engine_class)
{
- /* Allocate a continuous physical chunk of memory (GGTT address match
- * physical addresses).
- */
- uint32_t ggtt_ptes = STATIC_GGTT_MAP_SIZE >> 12;
- uint64_t phys_addr = aub->phys_addrs_allocator << 12;
+ const struct engine *cs = engine_from_ring_flag(engine_class);
uint32_t context_size;
- aub->phys_addrs_allocator += ggtt_ptes;
+ get_context_init(&aub->devinfo, NULL, engine_class, NULL, &context_size);
/* GGTT PT */
+ uint64_t phys_addr = aub->phys_addrs_allocator << 12;
+ uint32_t total_size = RING_SIZE + PPHWSP_SIZE + context_size;
+ uint32_t ggtt_ptes = DIV_ROUND_UP(total_size, 4096);
+ char name[80];
+
+ aub->phys_addrs_allocator += ggtt_ptes;
+
+ snprintf(name, sizeof(name), "%s GGTT PT", cs->name);
mem_trace_memory_write_header_out(aub,
sizeof(uint64_t) * (phys_addr >> 12),
ggtt_ptes * GEN8_PTE_SIZE,
AUB_MEM_TRACE_MEMORY_ADDRESS_SPACE_GGTT_ENTRY,
- "GGTT PT");
+ name);
for (uint32_t i = 0; i < ggtt_ptes; i++) {
dword_out(aub, 1 + 0x1000 * i + phys_addr);
dword_out(aub, 0);
}
- /* RENDER_RING */
- mem_trace_memory_write_header_out(aub, phys_addr + RENDER_RING_ADDR, RING_SIZE,
+ /* RING */
+ aub->engine_setup[engine_class].ring_addr = phys_addr;
+ snprintf(name, sizeof(name), "%s RING", cs->name);
+ mem_trace_memory_write_header_out(aub, phys_addr, RING_SIZE,
AUB_MEM_TRACE_MEMORY_ADDRESS_SPACE_GGTT,
- "RENDER RING");
+ name);
for (uint32_t i = 0; i < RING_SIZE; i += sizeof(uint32_t))
dword_out(aub, 0);
-
- /* RENDER_PPHWSP */
- mem_trace_memory_write_header_out(aub, phys_addr + RENDER_CONTEXT_ADDR,
- PPHWSP_SIZE +
- CONTEXT_RENDER_SIZE,
+ phys_addr += RING_SIZE;
+
+ /* PPHWSP */
+ aub->engine_setup[engine_class].pphwsp_addr = phys_addr;
+ aub->engine_setup[engine_class].descriptor = cs->hw_class | phys_addr | CONTEXT_FLAGS;
+ snprintf(name, sizeof(name), "%s PPHWSP", cs->name);
+ mem_trace_memory_write_header_out(aub, phys_addr,
+ PPHWSP_SIZE + context_size,
AUB_MEM_TRACE_MEMORY_ADDRESS_SPACE_GGTT,
- "RENDER PPHWSP");
+ name);
for (uint32_t i = 0; i < PPHWSP_SIZE; i += sizeof(uint32_t))
dword_out(aub, 0);
- /* RENDER_CONTEXT */
- data_out(aub, get_context_init(&aub->devinfo, I915_ENGINE_CLASS_RENDER, &context_size), CONTEXT_RENDER_SIZE);
- assert(context_size == CONTEXT_RENDER_SIZE);
-
- /* BLITTER_RING */
- mem_trace_memory_write_header_out(aub, phys_addr + BLITTER_RING_ADDR, RING_SIZE,
- AUB_MEM_TRACE_MEMORY_ADDRESS_SPACE_GGTT,
- "BLITTER RING");
- for (uint32_t i = 0; i < RING_SIZE; i += sizeof(uint32_t))
- dword_out(aub, 0);
-
- /* BLITTER_PPHWSP */
- mem_trace_memory_write_header_out(aub, phys_addr + BLITTER_CONTEXT_ADDR,
- PPHWSP_SIZE +
- CONTEXT_OTHER_SIZE,
- AUB_MEM_TRACE_MEMORY_ADDRESS_SPACE_GGTT,
- "BLITTER PPHWSP");
- for (uint32_t i = 0; i < PPHWSP_SIZE; i += sizeof(uint32_t))
- dword_out(aub, 0);
-
- /* BLITTER_CONTEXT */
- data_out(aub, get_context_init(&aub->devinfo, I915_ENGINE_CLASS_COPY, &context_size), CONTEXT_OTHER_SIZE);
- assert(context_size == CONTEXT_OTHER_SIZE);
-
- /* VIDEO_RING */
- mem_trace_memory_write_header_out(aub, phys_addr + VIDEO_RING_ADDR, RING_SIZE,
- AUB_MEM_TRACE_MEMORY_ADDRESS_SPACE_GGTT,
- "VIDEO RING");
- for (uint32_t i = 0; i < RING_SIZE; i += sizeof(uint32_t))
- dword_out(aub, 0);
+ /* CONTEXT */
+ struct gen_context_parameters params = {
+ .ring_addr = aub->engine_setup[engine_class].ring_addr,
+ .ring_size = RING_SIZE,
+ .pml4_addr = aub->pml4.phys_addr,
+ };
+ uint32_t *context_data = calloc(1, context_size);
+ get_context_init(&aub->devinfo, ¶ms, engine_class, context_data, &context_size);
+ data_out(aub, context_data, context_size);
+ free(context_data);
- /* VIDEO_PPHWSP */
- mem_trace_memory_write_header_out(aub, phys_addr + VIDEO_CONTEXT_ADDR,
- PPHWSP_SIZE +
- CONTEXT_OTHER_SIZE,
- AUB_MEM_TRACE_MEMORY_ADDRESS_SPACE_GGTT,
- "VIDEO PPHWSP");
- for (uint32_t i = 0; i < PPHWSP_SIZE; i += sizeof(uint32_t))
- dword_out(aub, 0);
+ return total_size;
+}
- /* VIDEO_CONTEXT */
- data_out(aub, get_context_init(&aub->devinfo, I915_ENGINE_CLASS_VIDEO, &context_size), CONTEXT_OTHER_SIZE);
- assert(context_size == CONTEXT_OTHER_SIZE);
+static void
+write_execlists_default_setup(struct aub_file *aub)
+{
+ write_engine_execlist_setup(aub, I915_ENGINE_CLASS_RENDER);
+ write_engine_execlist_setup(aub, I915_ENGINE_CLASS_COPY);
+ write_engine_execlist_setup(aub, I915_ENGINE_CLASS_VIDEO);
- register_write_out(aub, HWS_PGA_RCSUNIT, RENDER_CONTEXT_ADDR);
- register_write_out(aub, HWS_PGA_VCSUNIT0, VIDEO_CONTEXT_ADDR);
- register_write_out(aub, HWS_PGA_BCSUNIT, BLITTER_CONTEXT_ADDR);
+ register_write_out(aub, HWS_PGA_RCSUNIT, aub->engine_setup[I915_ENGINE_CLASS_RENDER].pphwsp_addr);
+ register_write_out(aub, HWS_PGA_VCSUNIT0, aub->engine_setup[I915_ENGINE_CLASS_VIDEO].pphwsp_addr);
+ register_write_out(aub, HWS_PGA_BCSUNIT, aub->engine_setup[I915_ENGINE_CLASS_COPY].pphwsp_addr);
register_write_out(aub, GFX_MODE_RCSUNIT, 0x80008000 /* execlist enable */);
register_write_out(aub, GFX_MODE_VCSUNIT0, 0x80008000 /* execlist enable */);
@@ -557,62 +591,10 @@ aub_write_trace_block(struct aub_file *aub,
}
}
-static const struct engine {
- uint32_t elsp_reg;
- uint32_t elsq_reg;
- uint32_t status_reg;
- uint32_t control_reg;
-
- /* Those are only to be used if using the default context setup. */
- uint32_t default_ring_addr;
- uint64_t default_descriptor;
-} engines[] = {
- [I915_ENGINE_CLASS_RENDER] = {
- .elsp_reg = EXECLIST_SUBMITPORT_RCSUNIT,
- .elsq_reg = EXECLIST_SQ_CONTENTS0_RCSUNIT,
- .status_reg = EXECLIST_STATUS_RCSUNIT,
- .control_reg = EXECLIST_CONTROL_RCSUNIT,
-
- .default_ring_addr = RENDER_RING_ADDR,
- .default_descriptor = RENDER_CONTEXT_DESCRIPTOR,
- },
- [I915_ENGINE_CLASS_VIDEO] = {
- .elsp_reg = EXECLIST_SUBMITPORT_VCSUNIT0,
- .elsq_reg = EXECLIST_SQ_CONTENTS0_VCSUNIT0,
- .status_reg = EXECLIST_STATUS_VCSUNIT0,
- .control_reg = EXECLIST_CONTROL_VCSUNIT0,
-
- .default_ring_addr = VIDEO_RING_ADDR,
- .default_descriptor = VIDEO_CONTEXT_DESCRIPTOR,
- },
- [I915_ENGINE_CLASS_COPY] = {
- .elsp_reg = EXECLIST_SUBMITPORT_BCSUNIT,
- .elsq_reg = EXECLIST_SQ_CONTENTS0_BCSUNIT,
- .status_reg = EXECLIST_STATUS_BCSUNIT,
- .control_reg = EXECLIST_CONTROL_BCSUNIT,
-
- .default_ring_addr = BLITTER_RING_ADDR,
- .default_descriptor = BLITTER_CONTEXT_DESCRIPTOR,
- },
-};
-
-static const struct engine *
-engine_from_ring_flag(enum drm_i915_gem_engine_class engine_class)
-{
- switch (engine_class) {
- case I915_ENGINE_CLASS_RENDER:
- case I915_ENGINE_CLASS_COPY:
- case I915_ENGINE_CLASS_VIDEO:
- return &engines[engine_class];
- default:
- unreachable("unknown ring");
- }
-}
-
static void
aub_dump_ring_buffer(struct aub_file *aub, const struct engine *cs, uint64_t batch_offset)
{
- mem_trace_memory_write_header_out(aub, cs->default_ring_addr, 16,
+ mem_trace_memory_write_header_out(aub, aub->engine_setup[cs->engine_class].ring_addr, 16,
AUB_MEM_TRACE_MEMORY_ADDRESS_SPACE_GGTT,
"RING MI_BATCH_BUFFER_START user");
dword_out(aub, AUB_MI_BATCH_BUFFER_START | MI_BATCH_NON_SECURE_I965 | (3 - 2));
@@ -620,11 +602,11 @@ aub_dump_ring_buffer(struct aub_file *aub, const struct engine *cs, uint64_t bat
dword_out(aub, batch_offset >> 32);
dword_out(aub, 0 /* MI_NOOP */);
- mem_trace_memory_write_header_out(aub, cs->default_ring_addr + 8192 + 20, 4,
+ mem_trace_memory_write_header_out(aub, aub->engine_setup[cs->engine_class].ring_addr + 8192 + 20, 4,
AUB_MEM_TRACE_MEMORY_ADDRESS_SPACE_GGTT,
"RING BUFFER HEAD");
dword_out(aub, 0); /* RING_BUFFER_HEAD */
- mem_trace_memory_write_header_out(aub, cs->default_ring_addr + 8192 + 28, 4,
+ mem_trace_memory_write_header_out(aub, aub->engine_setup[cs->engine_class].ring_addr + 8192 + 28, 4,
AUB_MEM_TRACE_MEMORY_ADDRESS_SPACE_GGTT,
"RING BUFFER TAIL");
dword_out(aub, 16); /* RING_BUFFER_TAIL */
@@ -704,7 +686,7 @@ aub_write_exec(struct aub_file *aub, uint64_t batch_addr,
if (aub_use_execlists(aub)) {
aub_dump_ring_buffer(aub, cs, batch_addr);
- aub_dump_execlist(aub, cs, cs->default_descriptor);
+ aub_dump_execlist(aub, cs, aub->engine_setup[engine_class].descriptor);
} else {
/* Dump ring buffer */
aub_dump_ringbuffer(aub, batch_addr, offset, engine_class);
diff --git a/src/intel/tools/aub_write.h b/src/intel/tools/aub_write.h
index 6e94d80767d..51a252b7834 100644
--- a/src/intel/tools/aub_write.h
+++ b/src/intel/tools/aub_write.h
@@ -55,6 +55,12 @@ struct aub_file {
struct aub_ppgtt_table pml4;
uint64_t phys_addrs_allocator;
+
+ struct {
+ uint64_t ring_addr;
+ uint64_t pphwsp_addr;
+ uint64_t descriptor;
+ } engine_setup[I915_ENGINE_CLASS_VIDEO_ENHANCE + 1];
};
void aub_file_init(struct aub_file *aub, FILE *file, FILE *debug, uint16_t pci_id, const char *app_name);
diff --git a/src/intel/tools/gen10_context.h b/src/intel/tools/gen10_context.h
index a6e6c340fc6..e68fbac4a71 100644
--- a/src/intel/tools/gen10_context.h
+++ b/src/intel/tools/gen10_context.h
@@ -24,7 +24,8 @@
#ifndef GEN10_CONTEXT_H
#define GEN10_CONTEXT_H
-static inline void gen10_render_context_init(uint32_t *data, uint32_t *size)
+static inline void gen10_render_context_init(const struct gen_context_parameters *params,
+ uint32_t *data, uint32_t *size)
{
*size = CONTEXT_RENDER_SIZE;
if (!data)
@@ -35,8 +36,8 @@ static inline void gen10_render_context_init(uint32_t *data, uint32_t *size)
0x2244 /* CONTEXT_CONTROL */, 0x90009 /* Inhibit Synchronous Context Switch | Engine Context Restore Inhibit */,
0x2034 /* RING_HEAD */, 0,
0x2030 /* RING_TAIL */, 0,
- 0x2038 /* RING_BUFFER_START */, RENDER_RING_ADDR,
- 0x203C /* RING_BUFFER_CONTROL */, (RING_SIZE - 4096) | 1 /* Buffer Length | Ring Buffer Enable */,
+ 0x2038 /* RING_BUFFER_START */, params->ring_addr,
+ 0x203C /* RING_BUFFER_CONTROL */, (params->ring_size - 4096) | 1 /* Buffer Length | Ring Buffer Enable */,
0x2168 /* BB_HEAD_U */, 0,
0x2140 /* BB_HEAD_L */, 0,
0x2110 /* BB_STATE */, 0,
@@ -57,8 +58,8 @@ static inline void gen10_render_context_init(uint32_t *data, uint32_t *size)
0x2280 /* PDP2_LDW */, 0,
0x227C /* PDP1_UDW */, 0,
0x2278 /* PDP1_LDW */, 0,
- 0x2274 /* PDP0_UDW */, PML4_PHYS_ADDR >> 32,
- 0x2270 /* PDP0_LDW */, PML4_PHYS_ADDR);
+ 0x2274 /* PDP0_UDW */, params->pml4_addr >> 32,
+ 0x2270 /* PDP0_LDW */, params->pml4_addr & 0xffffffff);
for (int i = 0; i < 12; i++)
*data++ = 0; /* MI_NOOP */
@@ -74,7 +75,8 @@ static inline void gen10_render_context_init(uint32_t *data, uint32_t *size)
*data++ = MI_BATCH_BUFFER_END | 1 /* End Context */;
}
-static inline void gen10_blitter_context_init(uint32_t *data, uint32_t *size)
+static inline void gen10_blitter_context_init(const struct gen_context_parameters *params,
+ uint32_t *data, uint32_t *size)
{
*size = CONTEXT_OTHER_SIZE;
if (!data)
@@ -85,8 +87,8 @@ static inline void gen10_blitter_context_init(uint32_t *data, uint32_t *size)
0x22244 /* CONTEXT_CONTROL */, 0x90009 /* Inhibit Synchronous Context Switch | Engine Context Restore Inhibit */,
0x22034 /* RING_HEAD */, 0,
0x22030 /* RING_TAIL */, 0,
- 0x22038 /* RING_BUFFER_START */, BLITTER_RING_ADDR,
- 0x2203C /* RING_BUFFER_CONTROL */, (RING_SIZE - 4096) | 1 /* Buffer Length | Ring Buffer Enable */,
+ 0x22038 /* RING_BUFFER_START */, params->ring_addr,
+ 0x2203C /* RING_BUFFER_CONTROL */, (params->ring_size - 4096) | 1 /* Buffer Length | Ring Buffer Enable */,
0x22168 /* BB_HEAD_U */, 0,
0x22140 /* BB_HEAD_L */, 0,
0x22110 /* BB_STATE */, 0,
@@ -108,8 +110,8 @@ static inline void gen10_blitter_context_init(uint32_t *data, uint32_t *size)
0x22280 /* PDP2_LDW */, 0,
0x2227C /* PDP1_UDW */, 0,
0x22278 /* PDP1_LDW */, 0,
- 0x22274 /* PDP0_UDW */, PML4_PHYS_ADDR >> 32,
- 0x22270 /* PDP0_LDW */, PML4_PHYS_ADDR);
+ 0x22274 /* PDP0_UDW */, params->pml4_addr >> 32,
+ 0x22270 /* PDP0_LDW */, params->pml4_addr & 0xffffffff);
for (int i = 0; i < 13; i++)
*data++ = 0 /* MI_NOOP */;
@@ -123,7 +125,8 @@ static inline void gen10_blitter_context_init(uint32_t *data, uint32_t *size)
*data++ = MI_BATCH_BUFFER_END | 1 /* End Context */;
}
-static inline void gen10_video_context_init(uint32_t *data, uint32_t *size)
+static inline void gen10_video_context_init(const struct gen_context_parameters *params,
+ uint32_t *data, uint32_t *size)
{
*size = CONTEXT_OTHER_SIZE;
if (!data)
@@ -134,8 +137,8 @@ static inline void gen10_video_context_init(uint32_t *data, uint32_t *size)
0x1C244 /* CONTEXT_CONTROL */, 0x90009 /* Inhibit Synchronous Context Switch | Engine Context Restore Inhibit */,
0x1C034 /* RING_HEAD */, 0,
0x1C030 /* RING_TAIL */, 0,
- 0x1C038 /* RING_BUFFER_START */, VIDEO_RING_ADDR,
- 0x1C03C /* RING_BUFFER_CONTROL */, (RING_SIZE - 4096) | 1 /* Buffer Length | Ring Buffer Enable */,
+ 0x1C038 /* RING_BUFFER_START */, params->ring_addr,
+ 0x1C03C /* RING_BUFFER_CONTROL */, (params->ring_size - 4096) | 1 /* Buffer Length | Ring Buffer Enable */,
0x1C168 /* BB_HEAD_U */, 0,
0x1C140 /* BB_HEAD_L */, 0,
0x1C110 /* BB_STATE */, 0,
@@ -154,8 +157,8 @@ static inline void gen10_video_context_init(uint32_t *data, uint32_t *size)
0x1C280 /* PDP2_LDW */, 0,
0x1C27C /* PDP1_UDW */, 0,
0x1C278 /* PDP1_LDW */, 0,
- 0x1C274 /* PDP0_UDW */, PML4_PHYS_ADDR >> 32,
- 0x1C270 /* PDP0_LDW */, PML4_PHYS_ADDR);
+ 0x1C274 /* PDP0_UDW */, params->pml4_addr >> 32,
+ 0x1C270 /* PDP0_LDW */, params->pml4_addr & 0xffffffff);
for (int i = 0; i < 12; i++)
*data++ = 0 /* MI_NOOP */;
diff --git a/src/intel/tools/gen8_context.h b/src/intel/tools/gen8_context.h
index 4b2c83e77fa..410a7f6d772 100644
--- a/src/intel/tools/gen8_context.h
+++ b/src/intel/tools/gen8_context.h
@@ -24,7 +24,8 @@
#ifndef GEN8_CONTEXT_H
#define GEN8_CONTEXT_H
-static inline void gen8_render_context_init(uint32_t *data, uint32_t *size)
+static inline void gen8_render_context_init(const struct gen_context_parameters *params,
+ uint32_t *data, uint32_t *size)
{
*size = CONTEXT_RENDER_SIZE;
if (!data)
@@ -36,8 +37,8 @@ static inline void gen8_render_context_init(uint32_t *data, uint32_t *size)
0x90009 /* Inhibit Synchronous Context Switch | Engine Context Restore Inhibit */,
0x2034 /* RING_HEAD */, 0,
0x2030 /* RING_TAIL */, 0,
- 0x2038 /* RING_BUFFER_START */, RENDER_RING_ADDR,
- 0x203C /* RING_BUFFER_CONTROL */, (RING_SIZE - 4096) | 1 /* Buffer Length | Ring Buffer Enable */,
+ 0x2038 /* RING_BUFFER_START */, params->ring_addr,
+ 0x203C /* RING_BUFFER_CONTROL */, (params->ring_addr - 4096) | 1 /* Buffer Length | Ring Buffer Enable */,
0x2168 /* BB_HEAD_U */, 0,
0x2140 /* BB_HEAD_L */, 0,
0x2110 /* BB_STATE */, 0,
@@ -60,8 +61,8 @@ static inline void gen8_render_context_init(uint32_t *data, uint32_t *size)
0x2280 /* PDP2_LDW */, 0,
0x227C /* PDP1_UDW */, 0,
0x2278 /* PDP1_LDW */, 0,
- 0x2274 /* PDP0_UDW */, PML4_PHYS_ADDR >> 32,
- 0x2270 /* PDP0_LDW */, PML4_PHYS_ADDR);
+ 0x2274 /* PDP0_UDW */, params->pml4_addr >> 32,
+ 0x2270 /* PDP0_LDW */, params->pml4_addr & 0xffffffff);
/* MI_NOOP */
for (int i = 0; i < 12; i++)
*data++ = 0 /* MI_NOOP */;
@@ -72,7 +73,8 @@ static inline void gen8_render_context_init(uint32_t *data, uint32_t *size)
*data++ = MI_BATCH_BUFFER_END;
}
-static inline void gen8_blitter_context_init(uint32_t *data, uint32_t *size)
+static inline void gen8_blitter_context_init(const struct gen_context_parameters *params,
+ uint32_t *data, uint32_t *size)
{
*size = CONTEXT_OTHER_SIZE;
if (!data)
@@ -83,8 +85,8 @@ static inline void gen8_blitter_context_init(uint32_t *data, uint32_t *size)
0x22244 /* CONTEXT_CONTROL */, 0x90009 /* Inhibit Synchronous Context Switch | Engine Context Restore Inhibit */,
0x22034 /* RING_HEAD */, 0,
0x22030 /* RING_TAIL */, 0,
- 0x22038 /* RING_BUFFER_START */, BLITTER_RING_ADDR,
- 0x2203C /* RING_BUFFER_CONTROL */, (RING_SIZE - 4096) | 1 /* Buffer Length | Ring Buffer Enable */,
+ 0x22038 /* RING_BUFFER_START */, params->ring_addr,
+ 0x2203C /* RING_BUFFER_CONTROL */, (params->ring_size - 4096) | 1 /* Buffer Length | Ring Buffer Enable */,
0x22168 /* BB_HEAD_U */, 0,
0x22140 /* BB_HEAD_L */, 0,
0x22110 /* BB_STATE */, 0,
@@ -104,8 +106,8 @@ static inline void gen8_blitter_context_init(uint32_t *data, uint32_t *size)
0x22280 /* PDP2_LDW */, 0,
0x2227C /* PDP1_UDW */, 0,
0x22278 /* PDP1_LDW */, 0,
- 0x22274 /* PDP0_UDW */, PML4_PHYS_ADDR >> 32,
- 0x22270 /* PDP0_LDW */, PML4_PHYS_ADDR);
+ 0x22274 /* PDP0_UDW */, params->pml4_addr >> 32,
+ 0x22270 /* PDP0_LDW */, params->pml4_addr & 0xffffffff);
for (int i = 0; i < 12; i++)
*data++ = 0 /* MI_NOOP */;
@@ -113,7 +115,8 @@ static inline void gen8_blitter_context_init(uint32_t *data, uint32_t *size)
*data++ = MI_BATCH_BUFFER_END;
}
-static inline void gen8_video_context_init(uint32_t *data, uint32_t *size)
+static inline void gen8_video_context_init(const struct gen_context_parameters *params,
+ uint32_t *data, uint32_t *size)
{
*size = CONTEXT_OTHER_SIZE;
if (!data)
@@ -124,8 +127,8 @@ static inline void gen8_video_context_init(uint32_t *data, uint32_t *size)
0x1C244 /* CONTEXT_CONTROL */, 0x90009 /* Inhibit Synchronous Context Switch | Engine Context Restore Inhibit */,
0x1C034 /* RING_HEAD */, 0,
0x1C030 /* RING_TAIL */, 0,
- 0x1C038 /* RING_BUFFER_START */, VIDEO_RING_ADDR,
- 0x1C03C /* RING_BUFFER_CONTROL */, (RING_SIZE - 4096) | 1 /* Buffer Length | Ring Buffer Enable */,
+ 0x1C038 /* RING_BUFFER_START */, params->ring_addr,
+ 0x1C03C /* RING_BUFFER_CONTROL */, (params->ring_size - 4096) | 1 /* Buffer Length | Ring Buffer Enable */,
0x1C168 /* BB_HEAD_U */, 0,
0x1C140 /* BB_HEAD_L */, 0,
0x1C110 /* BB_STATE */, 0,
@@ -144,8 +147,8 @@ static inline void gen8_video_context_init(uint32_t *data, uint32_t *size)
0x1C280 /* PDP2_LDW */, 0,
0x1C27C /* PDP1_UDW */, 0,
0x1C278 /* PDP1_LDW */, 0,
- 0x1C274 /* PDP0_UDW */, PML4_PHYS_ADDR >> 32,
- 0x1C270 /* PDP0_LDW */, PML4_PHYS_ADDR);
+ 0x1C274 /* PDP0_UDW */, params->pml4_addr >> 32,
+ 0x1C270 /* PDP0_LDW */, params->pml4_addr & 0xffffffff);
for (int i = 0; i < 12; i++)
*data++ = 0 /* MI_NOOP */;
diff --git a/src/intel/tools/gen_context.h b/src/intel/tools/gen_context.h
index e7b75806e4e..3678d8d6965 100644
--- a/src/intel/tools/gen_context.h
+++ b/src/intel/tools/gen_context.h
@@ -75,22 +75,6 @@
#define NUM_PT_ENTRIES (ALIGN(MEMORY_MAP_SIZE, 4096) / 4096)
#define PT_SIZE ALIGN(NUM_PT_ENTRIES * GEN8_PTE_SIZE, 4096)
-#define STATIC_GGTT_MAP_START 0
-
-#define RENDER_RING_ADDR STATIC_GGTT_MAP_START
-#define RENDER_CONTEXT_ADDR (RENDER_RING_ADDR + RING_SIZE)
-
-#define BLITTER_RING_ADDR (RENDER_CONTEXT_ADDR + PPHWSP_SIZE + GEN9_LR_CONTEXT_RENDER_SIZE)
-#define BLITTER_CONTEXT_ADDR (BLITTER_RING_ADDR + RING_SIZE)
-
-#define VIDEO_RING_ADDR (BLITTER_CONTEXT_ADDR + PPHWSP_SIZE + GEN8_LR_CONTEXT_OTHER_SIZE)
-#define VIDEO_CONTEXT_ADDR (VIDEO_RING_ADDR + RING_SIZE)
-
-#define STATIC_GGTT_MAP_END (VIDEO_CONTEXT_ADDR + PPHWSP_SIZE + GEN8_LR_CONTEXT_OTHER_SIZE)
-#define STATIC_GGTT_MAP_SIZE (STATIC_GGTT_MAP_END - STATIC_GGTT_MAP_START)
-
-#define PML4_PHYS_ADDR ((uint64_t)(STATIC_GGTT_MAP_END))
-
#define CONTEXT_FLAGS (0x339) /* Normal Priority | L3-LLC Coherency |
* PPGTT Enabled |
* Legacy Context with 64 bit VA support |
@@ -105,9 +89,14 @@
*(data)++ = __regs[__e]; \
} while (0)
-#define RENDER_CONTEXT_DESCRIPTOR ((uint64_t)1 << 62 | RENDER_CONTEXT_ADDR | CONTEXT_FLAGS)
-#define BLITTER_CONTEXT_DESCRIPTOR ((uint64_t)2 << 62 | BLITTER_CONTEXT_ADDR | CONTEXT_FLAGS)
-#define VIDEO_CONTEXT_DESCRIPTOR ((uint64_t)3 << 62 | VIDEO_CONTEXT_ADDR | CONTEXT_FLAGS)
+
+struct gen_context_parameters {
+ uint64_t pml4_addr;
+ uint64_t ring_addr;
+ uint32_t ring_size;
+};
+
+typedef void (*gen_context_init_t)(const struct gen_context_parameters *, uint32_t *, uint32_t *);
#include "gen8_context.h"
#include "gen10_context.h"
--
2.19.0
More information about the mesa-dev
mailing list