[Intel-gfx] [PATCH 3/3] Add a more debug registers to ringbuffer_info

[Eric Anholt]

On Fri, 2009-03-20 at 11:54 -0700, Carl Worth wrote:
> From: Ben Gamari <bgamari at gmail.com>
> 
> Add INSTDONE and IPEIR to ringbuffer_info output

There are a few more INSTDONE-type registers that should probably go in
with INSTDONE, and these two are different on 915/965, which should get
fixed.  Check intel_gpu_idle for some more info on them.

If we're putting in performance counter-ish regs like INSTDONE (the 965
stats regs can be used pretty similarly to INSTDONE to get more
granularity on what's going on), we might want to put them in a separate
node.  Not sure.  If not, we might just squash this patch into the
previous one.

Pretty satisfied with the first two in the series, though.  Needs
Signed-off-by: and we're probably ready.

> ---
>  drivers/gpu/drm/i915/i915_gem_debugfs.c |    2 ++
>  drivers/gpu/drm/i915/i915_reg.h         |    2 ++
>  2 files changed, 4 insertions(+), 0 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/i915_gem_debugfs.c b/drivers/gpu/drm/i915/i915_gem_debugfs.c
> index 3a2cd34..32d1b79 100644
> --- a/drivers/gpu/drm/i915/i915_gem_debugfs.c
> +++ b/drivers/gpu/drm/i915/i915_gem_debugfs.c
> @@ -325,6 +325,8 @@ static int i915_ringbuffer_info(struct seq_file *m, void *data)
>  	seq_printf(m, "RingMask :  %08x\n", mask);
>  	seq_printf(m, "RingSize :  %08lx\n", dev_priv->ring.Size);
>  	seq_printf(m, "Acthd :  %08x\n", I915_READ(IS_I965G(dev) ? ACTHD_I965 : ACTHD));
> +	seq_printf(m, "IPEIR :  %08x\n", I915_READ(IPEIR));
> +	seq_printf(m, "InstDone :  %08x\n", I915_READ(INSTDONE));
>  
>  	return 0;
>  }
> diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
> index b769027..7161ac0 100644
> --- a/drivers/gpu/drm/i915/i915_reg.h
> +++ b/drivers/gpu/drm/i915/i915_reg.h
> @@ -226,6 +226,8 @@
>  #define HWS_ADDRESS_MASK	0xfffff000
>  #define HWS_START_ADDRESS_SHIFT	4
>  #define IPEIR		0x02088
> +#define IPEHR		0x0208C
> +#define INSTDONE	0x02090
>  #define NOPID		0x02094
>  #define HWSTAM		0x02098
>  #define SCPD0		0x0209c /* 915+ only */
-- 
Eric Anholt
eric at anholt.net                         eric.anholt at intel.com


-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 197 bytes
Desc: This is a digitally signed message part
URL: <http://lists.freedesktop.org/archives/intel-gfx/attachments/20090320/64e33f92/attachment.sig>