The GEN6_INSTDONE_1 and GEN6_INSTDONE_2 registers are just the old
INSTDONE_I965 and INSTDONE_1 registers but renamed. Let's use the old
names (this is what the kernel does).
Signed-off-by: Damien Lespiau <damien.lespiau@xxxxxxxxx>
---
lib/instdone.c | 6 +++---
tools/intel_reg_dumper.c | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/lib/instdone.c b/lib/instdone.c
index 18b2613..99857e2 100644
--- a/lib/instdone.c
+++ b/lib/instdone.c
@@ -239,7 +239,7 @@
# define G4X_VS0_DONE (1 << 1)
# define G4X_VF_DONE (1 << 0)
-/* GEN6_INSTDONE_2 */
+/* INSTDONE_1 */
# define GEN6_GAM_DONE (1 << 31)
# define GEN6_CS_DONE (1 << 30)
# define GEN6_WMBE_DONE (1 << 29)
@@ -307,13 +307,13 @@ gen4_instdone1_bit(uint32_t bit, const char *name)
static void
gen6_instdone1_bit(uint32_t bit, const char *name)
{
- add_instdone_bit(GEN6_INSTDONE_1, bit, name);
+ add_instdone_bit(INSTDONE_I965, bit, name);
}
static void
gen6_instdone2_bit(uint32_t bit, const char *name)
{
- add_instdone_bit(GEN6_INSTDONE_2, bit, name);
+ add_instdone_bit(INSTDONE_1, bit, name);
}
static void
diff --git a/tools/intel_reg_dumper.c b/tools/intel_reg_dumper.c
index 8d8aa91..805b665 100644
--- a/tools/intel_reg_dumper.c
+++ b/tools/intel_reg_dumper.c
@@ -2003,8 +2003,8 @@ static struct reg_debug gen6_fences[] = {
static struct reg_debug ironlake_debug_regs[] = {
DEFINEREG(PGETBL_CTL),
- DEFINEREG(GEN6_INSTDONE_1),
- DEFINEREG(GEN6_INSTDONE_2),
+ DEFINEREG(INSTDONE_I965),
+ DEFINEREG(INSTDONE_1),
DEFINEREG2(CPU_VGACNTRL, i830_debug_vgacntrl),
DEFINEREG(DIGITAL_PORT_HOTPLUG_CNTRL),
--
1.8.3.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
