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>

diff --git a/lib/instdone.c b/lib/instdone.c
index 2038842..b4d51f0 100644 (file)
--- a/lib/instdone.c
+++ b/lib/instdone.c
@@ -46,19 +46,19 @@ add_instdone_bit(uint32_t reg, uint32_t bit, const char *name)
 static void
 gen3_instdone_bit(uint32_t bit, const char *name)
 {
-       add_instdone_bit(INST_DONE, bit, name);
+       add_instdone_bit(INSTDONE, bit, name);
 }
 
 static void
 gen4_instdone_bit(uint32_t bit, const char *name)
 {
-       add_instdone_bit(INST_DONE_I965, bit, name);
+       add_instdone_bit(INSTDONE_I965, bit, name);
 }
 
 static void
 gen4_instdone1_bit(uint32_t bit, const char *name)
 {
-       add_instdone_bit(INST_DONE_1, bit, name);
+       add_instdone_bit(INSTDONE_1, bit, name);
 }
 
 static void

diff --git a/lib/intel_reg.h b/lib/intel_reg.h
index d8eec65..b6404e4 100644 (file)
--- a/lib/intel_reg.h
+++ b/lib/intel_reg.h
@@ -370,7 +370,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define IPEIR                  0x2088
 #define IPEHR                  0x208C
 
-#define INST_DONE                0x2090
+#define INSTDONE                0x2090
 # define IDCT_DONE                     (1 << 30)
 # define IQ_DONE                       (1 << 29)
 # define PR_DONE                       (1 << 28)
@@ -434,7 +434,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define INST_PS                  0x20c4
 #define IPEIR_I965                  0x2064 /* i965 */
 #define IPEHR_I965                  0x2068 /* i965 */
-#define INST_DONE_I965              0x206c
+#define INSTDONE_I965              0x206c
 # define I965_ROW_0_EU_0_DONE          (1 << 31)
 # define I965_ROW_0_EU_1_DONE          (1 << 30)
 # define I965_ROW_0_EU_2_DONE          (1 << 29)
@@ -541,7 +541,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 #define DMA_FADD_P             0x2078
 #define DMA_FADD_S               0x20d4
-#define INST_DONE_1              0x207c
+#define INSTDONE_1              0x207c
 # define I965_GW_CS_DONE_CR            (1 << 19)
 # define I965_SVSM_CS_DONE_CR          (1 << 18)
 # define I965_SVDW_CS_DONE_CR          (1 << 17)

diff --git a/tools/intel_error_decode.c b/tools/intel_error_decode.c
index 529ec54..ac0b194 100644 (file)
--- 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 c8b506a..31e080a 100644 (file)
--- 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 6064695..8d8aa91 100644 (file)
--- 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),