OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

intel: Fix decoding for partial STATE_BASE_ADDRESS updates.

Browse Source 
STATE_BASE_ADDRESS only modifies various bases if the "modify" bit is
set.  Otherwise, we want to keep the existing base address.

Iris uses this for updating Surface State Base Address while leaving the
others as-is.

v2: Also update aubinator_viewer_decoder (caught by Lionel)
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
This commit is contained in:
Kenneth Graunke
2018-10-21 21:41:39 -07:00
parent 16870de8a0
commit 00103db04a
2 changed files with 42 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/intel/common/gen_batch_decoder.c
View File

@@ -200,15 +200,33 @@ handle_state_base_address(struct gen_batch_decode_ctx *ctx, const uint32_t *p)
struct gen_field_iterator iter;
gen_field_iterator_init(&iter, inst, p, 0, false);
uint64_t surface_base = 0, dynamic_base = 0, instruction_base = 0;
bool surface_modify = 0, dynamic_modify = 0, instruction_modify = 0;
while (gen_field_iterator_next(&iter)) {
if (strcmp(iter.name, "Surface State Base Address") == 0) {
ctx->surface_base = iter.raw_value;
surface_base = iter.raw_value;
} else if (strcmp(iter.name, "Dynamic State Base Address") == 0) {
ctx->dynamic_base = iter.raw_value;
dynamic_base = iter.raw_value;
} else if (strcmp(iter.name, "Instruction Base Address") == 0) {
ctx->instruction_base = iter.raw_value;
instruction_base = iter.raw_value;
} else if (strcmp(iter.name, "Surface State Base Address Modify Enable") == 0) {
surface_modify = iter.raw_value;
} else if (strcmp(iter.name, "Dynamic State Base Address Modify Enable") == 0) {
dynamic_modify = iter.raw_value;
} else if (strcmp(iter.name, "Insntruction Base Address Modify Enable") == 0) {
instruction_modify = iter.raw_value;
}
}
if (dynamic_modify)
ctx->dynamic_base = dynamic_base;
if (surface_modify)
ctx->surface_base = surface_base;
if (instruction_modify)
ctx->instruction_base = instruction_base;
}
static void

24
src/intel/tools/aubinator_viewer_decoder.cpp
View File

@@ -158,15 +158,33 @@ handle_state_base_address(struct aub_viewer_decode_ctx *ctx,
struct gen_field_iterator iter;
gen_field_iterator_init(&iter, inst, p, 0, false);
uint64_t surface_base = 0, dynamic_base = 0, instruction_base = 0;
bool surface_modify = 0, dynamic_modify = 0, instruction_modify = 0;
while (gen_field_iterator_next(&iter)) {
if (strcmp(iter.name, "Surface State Base Address") == 0) {
ctx->surface_base = iter.raw_value;
surface_base = iter.raw_value;
} else if (strcmp(iter.name, "Dynamic State Base Address") == 0) {
ctx->dynamic_base = iter.raw_value;
dynamic_base = iter.raw_value;
} else if (strcmp(iter.name, "Instruction Base Address") == 0) {
ctx->instruction_base = iter.raw_value;
instruction_base = iter.raw_value;
} else if (strcmp(iter.name, "Surface State Base Address Modify Enable") == 0) {
surface_modify = iter.raw_value;
} else if (strcmp(iter.name, "Dynamic State Base Address Modify Enable") == 0) {
dynamic_modify = iter.raw_value;
} else if (strcmp(iter.name, "Insntruction Base Address Modify Enable") == 0) {
instruction_modify = iter.raw_value;
}
}
if (dynamic_modify)
ctx->dynamic_base = dynamic_base;
if (surface_modify)
ctx->surface_base = surface_base;
if (instruction_modify)
ctx->instruction_base = instruction_base;
}
static void