From a1baf3050e3b329cf52064ec92c1dbd8bde3aab0 Mon Sep 17 00:00:00 2001 From: Damien Lespiau Date: Tue, 4 Jun 2013 11:36:23 +0100 Subject: lib: Use INSTDONE_I965 and INSTDONE_1 for gen6 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). Reviewed-by: Kenneth Graunke Signed-off-by: Damien Lespiau --- lib/instdone.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'lib') diff --git a/lib/instdone.c b/lib/instdone.c index 18b26134..99857e20 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 -- cgit v1.2.3