diff options
| author | Damien Lespiau <damien.lespiau@intel.com> | 2013-06-04 05:41:36 +0100 |
|---|---|---|
| committer | Damien Lespiau <damien.lespiau@intel.com> | 2014-01-07 16:47:33 +0000 |
| commit | d8b1dee220dc07bfae9d7fd82e360cc56bf9c30f (patch) | |
| tree | ee3430176f818cca07923bab142da4ce0bc46f8d /tools | |
| parent | 98c10d379b8d6b8e34da1e9963a114413021838e (diff) | |
intel_reg: Renamed INST_DONE to INSTDONE
That's how the registers are named in the kernel defines.
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/intel_error_decode.c | 2 | ||||
| -rw-r--r-- | tools/intel_gpu_top.c | 8 | ||||
| -rw-r--r-- | tools/intel_reg_dumper.c | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/tools/intel_error_decode.c b/tools/intel_error_decode.c index 529ec54a..ac0b194c 100644 --- a/tools/intel_error_decode.c +++ b/tools/intel_error_decode.c @@ -102,7 +102,7 @@ print_instdone(uint32_t devid, unsigned int instdone, unsigned int instdone1) for (i = 0; i < num_instdone_bits; i++) { int busy = 0; - if (instdone_bits[i].reg == INST_DONE_1) { + if (instdone_bits[i].reg == INSTDONE_1) { if (!(instdone1 & instdone_bits[i].bit)) busy = 1; } else { diff --git a/tools/intel_gpu_top.c b/tools/intel_gpu_top.c index c8b506a8..31e080a7 100644 --- a/tools/intel_gpu_top.c +++ b/tools/intel_gpu_top.c @@ -144,7 +144,7 @@ update_idle_bit(struct top_bit *top_bit) { uint32_t reg_val; - if (top_bit->bit->reg == INST_DONE_1) + if (top_bit->bit->reg == INSTDONE_1) reg_val = instdone1; else reg_val = instdone; @@ -559,10 +559,10 @@ int main(int argc, char **argv) long long interval; ti = gettime(); if (IS_965(devid)) { - instdone = INREG(INST_DONE_I965); - instdone1 = INREG(INST_DONE_1); + instdone = INREG(INSTDONE_I965); + instdone1 = INREG(INSTDONE_1); } else - instdone = INREG(INST_DONE); + instdone = INREG(INSTDONE); for (j = 0; j < num_instdone_bits; j++) update_idle_bit(&top_bits[j]); diff --git a/tools/intel_reg_dumper.c b/tools/intel_reg_dumper.c index 60646951..8d8aa91c 100644 --- a/tools/intel_reg_dumper.c +++ b/tools/intel_reg_dumper.c @@ -2476,7 +2476,7 @@ static struct reg_debug i945gm_mi_regs[] = { DEFINEREG(HWS_PGA), DEFINEREG(IPEIR), DEFINEREG(IPEHR), - DEFINEREG(INST_DONE), + DEFINEREG(INSTDONE), DEFINEREG(NOP_ID), DEFINEREG(HWSTAM), DEFINEREG(SCPD0), |