flywithu/ntel-gpu-tools
1
0
Fork 0
mirror of https://github.com/tiagovignatti/intel-gpu-tools.git synced 2026-08-23 06:13:04 +00:00
Code Issues Releases Wiki Activity

lib: Use INSTDONE_I965 and INSTDONE_1 for gen6

Browse Source 
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 <kenneth@whitecape.org>
Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
This commit is contained in:
Damien Lespiau
2013-06-04 11:36:23 +01:00
parent 3ebd8aa95e
commit a1baf3050e
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/instdone.c
+3 -3
View File
@@ -239,7 +239,7 @@
# define G4X_VS0_DONE (1 << 1) # define G4X_VS0_DONE (1 << 1)
# define G4X_VF_DONE (1 << 0) # define G4X_VF_DONE (1 << 0)
/* GEN6_INSTDONE_2 */ /* INSTDONE_1 */
# define GEN6_GAM_DONE (1 << 31) # define GEN6_GAM_DONE (1 << 31)
# define GEN6_CS_DONE (1 << 30) # define GEN6_CS_DONE (1 << 30)
# define GEN6_WMBE_DONE (1 << 29) # define GEN6_WMBE_DONE (1 << 29)
@@ -307,13 +307,13 @@ gen4_instdone1_bit(uint32_t bit, const char *name)
static void static void
gen6_instdone1_bit(uint32_t bit, const char *name) 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 static void
gen6_instdone2_bit(uint32_t bit, const char *name) 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 static void
tools/intel_reg_dumper.c
+2 -2
View File
@@ -2003,8 +2003,8 @@ static struct reg_debug gen6_fences[] = {
static struct reg_debug ironlake_debug_regs[] = { static struct reg_debug ironlake_debug_regs[] = {
DEFINEREG(PGETBL_CTL), DEFINEREG(PGETBL_CTL),
DEFINEREG(GEN6_INSTDONE_1), DEFINEREG(INSTDONE_I965),
DEFINEREG(GEN6_INSTDONE_2), DEFINEREG(INSTDONE_1),
DEFINEREG2(CPU_VGACNTRL, i830_debug_vgacntrl), DEFINEREG2(CPU_VGACNTRL, i830_debug_vgacntrl),
DEFINEREG(DIGITAL_PORT_HOTPLUG_CNTRL), DEFINEREG(DIGITAL_PORT_HOTPLUG_CNTRL),