From: Daniel Vetter <daniel.vetter@ffwll.ch>
Date: Tue, 9 Jul 2013 08:46:09 +0000 (+0200)
Subject: tools/intel_reg_dumper: add gen6+ fences
X-Git-Tag: intel-gpu-tools-1.4~327
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d3221334d29f31d140b7bb64ba955701e59a1bf2;p=platform%2Fupstream%2Fintel-gpu-tools.git

tools/intel_reg_dumper: add gen6+ fences

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
---

diff --git a/lib/intel_reg.h b/lib/intel_reg.h
index 124fc47..d70b94a 100644
--- a/lib/intel_reg.h
+++ b/lib/intel_reg.h
@@ -800,6 +800,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define FENCE_PITCH_64	    0x00000060
 #define FENCE_VALID         0x00000001
 
+#define FENCE_REG_SANDYBRIDGE_0		0x100000
 
 /* Registers to control page table, p274
  */
diff --git a/tools/intel_reg_dumper.c b/tools/intel_reg_dumper.c
index 1d44660..a37d2fd 100644
--- a/tools/intel_reg_dumper.c
+++ b/tools/intel_reg_dumper.c
@@ -1959,6 +1959,45 @@ DEBUGSTRING(hsw_debug_util_pin_ctl)
 		 inverted_polarity);
 }
 
+static struct reg_debug gen6_fences[] = {
+#define DEFINEFENCE_SNB(i) \
+	{ FENCE_REG_SANDYBRIDGE_0 + (i) * 8, "FENCE START "#i, NULL, 0 }, \
+	{ FENCE_REG_SANDYBRIDGE_0 + (i) * 8 + 4, "FENCE START "#i, NULL, 0 }
+	DEFINEFENCE_SNB(0),
+	DEFINEFENCE_SNB(1),
+	DEFINEFENCE_SNB(2),
+	DEFINEFENCE_SNB(3),
+	DEFINEFENCE_SNB(4),
+	DEFINEFENCE_SNB(5),
+	DEFINEFENCE_SNB(6),
+	DEFINEFENCE_SNB(7),
+	DEFINEFENCE_SNB(8),
+	DEFINEFENCE_SNB(9),
+	DEFINEFENCE_SNB(10),
+	DEFINEFENCE_SNB(11),
+	DEFINEFENCE_SNB(12),
+	DEFINEFENCE_SNB(13),
+	DEFINEFENCE_SNB(14),
+	DEFINEFENCE_SNB(15),
+	DEFINEFENCE_SNB(16),
+	DEFINEFENCE_SNB(17),
+	DEFINEFENCE_SNB(18),
+	DEFINEFENCE_SNB(19),
+	DEFINEFENCE_SNB(20),
+	DEFINEFENCE_SNB(20),
+	DEFINEFENCE_SNB(21),
+	DEFINEFENCE_SNB(22),
+	DEFINEFENCE_SNB(23),
+	DEFINEFENCE_SNB(24),
+	DEFINEFENCE_SNB(25),
+	DEFINEFENCE_SNB(26),
+	DEFINEFENCE_SNB(27),
+	DEFINEFENCE_SNB(28),
+	DEFINEFENCE_SNB(29),
+	DEFINEFENCE_SNB(30),
+	DEFINEFENCE_SNB(31),
+};
+
 static struct reg_debug ironlake_debug_regs[] = {
 	DEFINEREG(PGETBL_CTL),
 	DEFINEREG(GEN6_INSTDONE_1),
@@ -2518,7 +2557,8 @@ static struct {
 	DECLARE_REGS("i945GM", i945gm_mi_regs),
 	DECLARE_REGS("Gen2",   intel_debug_regs),
 	DECLARE_REGS("Gen6",   gen6_rp_debug_regs),
-	DECLARE_REGS("Gen7.5", haswell_debug_regs)
+	DECLARE_REGS("Gen7.5", haswell_debug_regs),
+	DECLARE_REGS("Gen6+", gen6_fences),
 };
 #undef DECLARE_REGS
 
@@ -2926,8 +2966,10 @@ int main(int argc, char** argv)
 		intel_dump_other_regs();
 	}
 
-	if (IS_GEN6(devid) || IS_GEN7(devid))
+	if (IS_GEN6(devid) || IS_GEN7(devid)) {
+		intel_dump_regs(gen6_fences);
 		intel_dump_regs(gen6_rp_debug_regs);
+	}
 
 	power_well_put(power_well);