| Message ID | 1383451680-11173-17-git-send-email-benjamin.widawsky@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Sat, Nov 02, 2013 at 09:07:14PM -0700, Ben Widawsky wrote: > All the gen8 debugfs stuff I wasn't too lazy to update. We'll need more > later, I am certain. Looks like this could be squashed into patch 2 as they both attach the same infrastructure (swizzling). -Chris
On Mon, Nov 04, 2013 at 02:28:55PM +0000, Chris Wilson wrote: > On Sat, Nov 02, 2013 at 09:07:14PM -0700, Ben Widawsky wrote: > > All the gen8 debugfs stuff I wasn't too lazy to update. We'll need more > > later, I am certain. > > Looks like this could be squashed into patch 2 as they both attach the > same infrastructure (swizzling). > -Chris > Daniel, do you mind making the decision on this, and if you opt to squash, do that on merge?
2013/11/3 Ben Widawsky <benjamin.widawsky@intel.com>: > All the gen8 debugfs stuff I wasn't too lazy to update. We'll need more > later, I am certain. > > Signed-off-by: Ben Widawsky <ben@bwidawsk.net> > --- > drivers/gpu/drm/i915/i915_debugfs.c | 10 +++++++--- > 1 file changed, 7 insertions(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c > index d6cda9c..fa3492f 100644 > --- a/drivers/gpu/drm/i915/i915_debugfs.c > +++ b/drivers/gpu/drm/i915/i915_debugfs.c > @@ -1623,7 +1623,7 @@ static int i915_swizzle_info(struct seq_file *m, void *data) > I915_READ16(C0DRB3)); > seq_printf(m, "C1DRB3 = 0x%04x\n", > I915_READ16(C1DRB3)); > - } else if (IS_GEN6(dev) || IS_GEN7(dev)) { > + } else if (INTEL_INFO(dev)->gen >= 6) { > seq_printf(m, "MAD_DIMM_C0 = 0x%08x\n", > I915_READ(MAD_DIMM_C0)); > seq_printf(m, "MAD_DIMM_C1 = 0x%08x\n", > @@ -1632,8 +1632,12 @@ static int i915_swizzle_info(struct seq_file *m, void *data) > I915_READ(MAD_DIMM_C2)); > seq_printf(m, "TILECTL = 0x%08x\n", > I915_READ(TILECTL)); > - seq_printf(m, "ARB_MODE = 0x%08x\n", > - I915_READ(ARB_MODE)); > + if (IS_GEN8(dev)) > + seq_printf(m, "ARB_MODE = 0x%08x\n", > + I915_READ(GAMTARBMODE)); IMHO this could be misleading since ARB_MODE still exists and has a different address. I'd print "GAMTARBMODE" to make it clear we're not printing the value of 0x4030. > + else > + seq_printf(m, "ARB_MODE = 0x%08x\n", > + I915_READ(ARB_MODE)); > seq_printf(m, "DISP_ARB_CTL = 0x%08x\n", > I915_READ(DISP_ARB_CTL)); > } > -- > 1.8.4.2 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx
diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c index d6cda9c..fa3492f 100644 --- a/drivers/gpu/drm/i915/i915_debugfs.c +++ b/drivers/gpu/drm/i915/i915_debugfs.c @@ -1623,7 +1623,7 @@ static int i915_swizzle_info(struct seq_file *m, void *data) I915_READ16(C0DRB3)); seq_printf(m, "C1DRB3 = 0x%04x\n", I915_READ16(C1DRB3)); - } else if (IS_GEN6(dev) || IS_GEN7(dev)) { + } else if (INTEL_INFO(dev)->gen >= 6) { seq_printf(m, "MAD_DIMM_C0 = 0x%08x\n", I915_READ(MAD_DIMM_C0)); seq_printf(m, "MAD_DIMM_C1 = 0x%08x\n", @@ -1632,8 +1632,12 @@ static int i915_swizzle_info(struct seq_file *m, void *data) I915_READ(MAD_DIMM_C2)); seq_printf(m, "TILECTL = 0x%08x\n", I915_READ(TILECTL)); - seq_printf(m, "ARB_MODE = 0x%08x\n", - I915_READ(ARB_MODE)); + if (IS_GEN8(dev)) + seq_printf(m, "ARB_MODE = 0x%08x\n", + I915_READ(GAMTARBMODE)); + else + seq_printf(m, "ARB_MODE = 0x%08x\n", + I915_READ(ARB_MODE)); seq_printf(m, "DISP_ARB_CTL = 0x%08x\n", I915_READ(DISP_ARB_CTL)); }
All the gen8 debugfs stuff I wasn't too lazy to update. We'll need more later, I am certain. Signed-off-by: Ben Widawsky <ben@bwidawsk.net> --- drivers/gpu/drm/i915/i915_debugfs.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)