[Intel-gfx] [PATCH 1/3] drm/i915: Remove trace_i915_gem_object_fault

Chris Wilson chris at chris-wilson.co.uk
Sun May 3 20:09:50 UTC 2020


The tracepoint is only covering one of the possible fault handlers;
clearly no longer of interest.

Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
---
 drivers/gpu/drm/i915/gem/i915_gem_mman.c |  2 --
 drivers/gpu/drm/i915/i915_trace.h        | 25 ------------------------
 2 files changed, 27 deletions(-)

diff --git a/drivers/gpu/drm/i915/gem/i915_gem_mman.c b/drivers/gpu/drm/i915/gem/i915_gem_mman.c
index 70f5f82da288..97a58b592c37 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_mman.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_mman.c
@@ -296,8 +296,6 @@ static vm_fault_t vm_fault_gtt(struct vm_fault *vmf)
 	/* We don't use vmf->pgoff since that has the fake offset */
 	page_offset = (vmf->address - area->vm_start) >> PAGE_SHIFT;
 
-	trace_i915_gem_object_fault(obj, page_offset, true, write);
-
 	ret = i915_gem_object_pin_pages(obj);
 	if (ret)
 		goto err;
diff --git a/drivers/gpu/drm/i915/i915_trace.h b/drivers/gpu/drm/i915/i915_trace.h
index bc854ad60954..af4d1c74b54c 100644
--- a/drivers/gpu/drm/i915/i915_trace.h
+++ b/drivers/gpu/drm/i915/i915_trace.h
@@ -601,31 +601,6 @@ TRACE_EVENT(i915_gem_object_pread,
 		      __entry->obj, __entry->offset, __entry->len)
 );
 
-TRACE_EVENT(i915_gem_object_fault,
-	    TP_PROTO(struct drm_i915_gem_object *obj, u64 index, bool gtt, bool write),
-	    TP_ARGS(obj, index, gtt, write),
-
-	    TP_STRUCT__entry(
-			     __field(struct drm_i915_gem_object *, obj)
-			     __field(u64, index)
-			     __field(bool, gtt)
-			     __field(bool, write)
-			     ),
-
-	    TP_fast_assign(
-			   __entry->obj = obj;
-			   __entry->index = index;
-			   __entry->gtt = gtt;
-			   __entry->write = write;
-			   ),
-
-	    TP_printk("obj=%p, %s index=%llu %s",
-		      __entry->obj,
-		      __entry->gtt ? "GTT" : "CPU",
-		      __entry->index,
-		      __entry->write ? ", writable" : "")
-);
-
 DECLARE_EVENT_CLASS(i915_gem_object,
 	    TP_PROTO(struct drm_i915_gem_object *obj),
 	    TP_ARGS(obj),
-- 
2.20.1



More information about the Intel-gfx mailing list