[Intel-gfx] [PATCH 1/6] drm/i915: trace vm eviction instead of everything

[Daniel Vetter]

On Tue, Sep 24, 2013 at 09:57:56AM -0700, Ben Widawsky wrote:
> Tracing vm eviction is really the event we care about. For the cases we
> evict everything, we still will get the trace.
> 
> v2: Add the drm device to the trace since we might not be the only
> device in the system. (Chris)
> 
> Reviewed-by: Chris Wilson <chris at chris-wilson.co.uk>
> Signed-off-by: Ben Widawsky <ben at bwidawsk.net>

I've slurped in the entire patch series. Besides the one comment I've
mentioned in my direct reply to the patch it concerns my maintainer script
spotted a few more BUG_ONs. You'll score a "I told you so" if we blow up
there and get a hard-to-debug report ;-)

Thanks for the patches,
-Daniel

> ---
>  drivers/gpu/drm/i915/i915_gem_evict.c |  2 ++
>  drivers/gpu/drm/i915/i915_trace.h     | 15 +++++++++++++++
>  2 files changed, 17 insertions(+)
> 
> diff --git a/drivers/gpu/drm/i915/i915_gem_evict.c b/drivers/gpu/drm/i915/i915_gem_evict.c
> index 3a3981e..b737653 100644
> --- a/drivers/gpu/drm/i915/i915_gem_evict.c
> +++ b/drivers/gpu/drm/i915/i915_gem_evict.c
> @@ -175,6 +175,8 @@ int i915_gem_evict_vm(struct i915_address_space *vm, bool do_idle)
>  	struct i915_vma *vma, *next;
>  	int ret;
>  
> +	trace_i915_gem_evict_vm(vm);
> +
>  	if (do_idle) {
>  		ret = i915_gpu_idle(vm->dev);
>  		if (ret)
> diff --git a/drivers/gpu/drm/i915/i915_trace.h b/drivers/gpu/drm/i915/i915_trace.h
> index e2c5ee6..403309b 100644
> --- a/drivers/gpu/drm/i915/i915_trace.h
> +++ b/drivers/gpu/drm/i915/i915_trace.h
> @@ -233,6 +233,21 @@ TRACE_EVENT(i915_gem_evict_everything,
>  	    TP_printk("dev=%d", __entry->dev)
>  );
>  
> +TRACE_EVENT(i915_gem_evict_vm,
> +	    TP_PROTO(struct i915_address_space *vm),
> +	    TP_ARGS(vm),
> +
> +	    TP_STRUCT__entry(
> +			     __field(struct i915_address_space *, vm)
> +			    ),
> +
> +	    TP_fast_assign(
> +			   __entry->vm = vm;
> +			  ),
> +
> +	    TP_printk("dev=%d, vm=%p", __entry->vm->dev->primary->index, __entry->vm)
> +);
> +
>  TRACE_EVENT(i915_gem_ring_dispatch,
>  	    TP_PROTO(struct intel_ring_buffer *ring, u32 seqno, u32 flags),
>  	    TP_ARGS(ring, seqno, flags),
> -- 
> 1.8.4
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch