Quoting Tvrtko Ursulin (2017-05-15 11:31:04) > > On 12/05/2017 21:21, Chris Wilson wrote: > > trace_i915_gem_evict_everything and trace_i915_gem_ring_flush stopped > > being used when their parent functions were removed. > > > > Signed-off-by: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx> > > --- > > drivers/gpu/drm/i915/i915_trace.h | 72 +++++++++------------------------------ > > 1 file changed, 17 insertions(+), 55 deletions(-) > > > > diff --git a/drivers/gpu/drm/i915/i915_trace.h b/drivers/gpu/drm/i915/i915_trace.h > > index 16f2b03ff1c8..1d76631221b7 100644 > > --- a/drivers/gpu/drm/i915/i915_trace.h > > +++ b/drivers/gpu/drm/i915/i915_trace.h > > @@ -539,38 +539,6 @@ TRACE_EVENT(i915_gem_evict, > > __entry->flags & PIN_MAPPABLE ? ", mappable" : "") > > ); > > > > -TRACE_EVENT(i915_gem_evict_everything, > > - TP_PROTO(struct drm_device *dev), > > - TP_ARGS(dev), > > - > > - TP_STRUCT__entry( > > - __field(u32, dev) > > - ), > > - > > - TP_fast_assign( > > - __entry->dev = dev->primary->index; > > - ), > > - > > - 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(u32, dev) > > - __field(struct i915_address_space *, vm) > > - ), > > - > > - TP_fast_assign( > > - __entry->dev = vm->i915->drm.primary->index; > > - __entry->vm = vm; > > - ), > > - > > - TP_printk("dev=%d, vm=%p", __entry->dev, __entry->vm) > > -); > > - > > TRACE_EVENT(i915_gem_evict_node, > > TP_PROTO(struct i915_address_space *vm, struct drm_mm_node *node, unsigned int flags), > > TP_ARGS(vm, node, flags), > > @@ -599,6 +567,23 @@ TRACE_EVENT(i915_gem_evict_node, > > __entry->color, __entry->flags) > > ); > > > > +TRACE_EVENT(i915_gem_evict_vm, > > + TP_PROTO(struct i915_address_space *vm), > > + TP_ARGS(vm), > > + > > + TP_STRUCT__entry( > > + __field(u32, dev) > > + __field(struct i915_address_space *, vm) > > + ), > > + > > + TP_fast_assign( > > + __entry->dev = vm->i915->drm.primary->index; > > + __entry->vm = vm; > > + ), > > + > > + TP_printk("dev=%d, vm=%p", __entry->dev, __entry->vm) > > +); > > Why the move? Ordering consistency with i915_gem_evict.c for small -> large. -Chris _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx