From d8b1dee220dc07bfae9d7fd82e360cc56bf9c30f Mon Sep 17 00:00:00 2001 From: Damien Lespiau Date: Tue, 4 Jun 2013 05:41:36 +0100 Subject: intel_reg: Renamed INST_DONE to INSTDONE That's how the registers are named in the kernel defines. Reviewed-by: Kenneth Graunke Signed-off-by: Damien Lespiau --- lib/instdone.c | 6 +++--- lib/intel_reg.h | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'lib') diff --git a/lib/instdone.c b/lib/instdone.c index 2038842d..b4d51f0f 100644 --- 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 d8eec655..b6404e41 100644 --- 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) -- cgit v1.2.3