Web lists-archives.com

[PATCH] tracing, drm/i915: Remove unused trace events




From: Steven Rostedt (VMware) <rostedt@xxxxxxxxxxx>

Commit ce8daef3580 ("drm/i915: Remove dead
i915_gem_evict_everything()") removed the only instances of
trace_i915_gem_evict_everything.

Commit a7b9761d0a ("drm/i915: Split i915_gem_flush_ring() into seperate
invalidate/flush funcs") removed the only instances of
trace_i915_gem_ring_flush.

Commit 8b5d27b911 ("drm/i915: Remove intel_flip_work infrastructure")
removed the only instances of trace_i915_flip_request and
trace_i915_flip_complete.

But none of these commits removed the corresponding trace events that
created those tracepoints. As trace events take up memory to define
data structures and functions, even when not in use, remove these
obsolete trace events.

Signed-off-by: Steven Rostedt (VMware) <rostedt@xxxxxxxxxxx>
---
Index: linux-trace.git/drivers/gpu/drm/i915/i915_trace.h
===================================================================
--- linux-trace.git.orig/drivers/gpu/drm/i915/i915_trace.h
+++ linux-trace.git/drivers/gpu/drm/i915/i915_trace.h
@@ -539,21 +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),
@@ -649,29 +634,6 @@ TRACE_EVENT(i915_gem_request_queue,
 		      __entry->flags)
 );
 
-TRACE_EVENT(i915_gem_ring_flush,
-	    TP_PROTO(struct drm_i915_gem_request *req, u32 invalidate, u32 flush),
-	    TP_ARGS(req, invalidate, flush),
-
-	    TP_STRUCT__entry(
-			     __field(u32, dev)
-			     __field(u32, ring)
-			     __field(u32, invalidate)
-			     __field(u32, flush)
-			     ),
-
-	    TP_fast_assign(
-			   __entry->dev = req->i915->drm.primary->index;
-			   __entry->ring = req->engine->id;
-			   __entry->invalidate = invalidate;
-			   __entry->flush = flush;
-			   ),
-
-	    TP_printk("dev=%u, ring=%x, invalidate=%04x, flush=%04x",
-		      __entry->dev, __entry->ring,
-		      __entry->invalidate, __entry->flush)
-);
-
 DECLARE_EVENT_CLASS(i915_gem_request,
 	    TP_PROTO(struct drm_i915_gem_request *req),
 	    TP_ARGS(req),
@@ -842,42 +804,6 @@ DEFINE_EVENT(i915_gem_request, i915_gem_
 	    TP_ARGS(req)
 );
 
-TRACE_EVENT(i915_flip_request,
-	    TP_PROTO(int plane, struct drm_i915_gem_object *obj),
-
-	    TP_ARGS(plane, obj),
-
-	    TP_STRUCT__entry(
-		    __field(int, plane)
-		    __field(struct drm_i915_gem_object *, obj)
-		    ),
-
-	    TP_fast_assign(
-		    __entry->plane = plane;
-		    __entry->obj = obj;
-		    ),
-
-	    TP_printk("plane=%d, obj=%p", __entry->plane, __entry->obj)
-);
-
-TRACE_EVENT(i915_flip_complete,
-	    TP_PROTO(int plane, struct drm_i915_gem_object *obj),
-
-	    TP_ARGS(plane, obj),
-
-	    TP_STRUCT__entry(
-		    __field(int, plane)
-		    __field(struct drm_i915_gem_object *, obj)
-		    ),
-
-	    TP_fast_assign(
-		    __entry->plane = plane;
-		    __entry->obj = obj;
-		    ),
-
-	    TP_printk("plane=%d, obj=%p", __entry->plane, __entry->obj)
-);
-
 TRACE_EVENT_CONDITION(i915_reg_rw,
 	TP_PROTO(bool write, i915_reg_t reg, u64 val, int len, bool trace),