---

yaml --- r: 228772 b: refs/heads/master c: 60de2ba h: refs/heads/master v: v3
git-mirror · Dec 2, 2010 · 404f900 · 404f900
1 parent b553da4
commit 404f900
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 26 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c6748e09eed072be077fe583976516b76daf42ec
+refs/heads/master: 60de2ba51eaba9eefcc355cb20c8582b1481e755
diff --git a/trunk/drivers/gpu/drm/i915/i915_gem.c b/trunk/drivers/gpu/drm/i915/i915_gem.c
@@ -2603,9 +2603,6 @@ i915_gem_object_get_fence(struct drm_i915_gem_object *obj,
 		break;
 	}
 
-	trace_i915_gem_object_get_fence(obj,
-					obj->fence_reg,
-					obj->tiling_mode);
 	return ret;
 }
 

diff --git a/trunk/drivers/gpu/drm/i915/i915_trace.h b/trunk/drivers/gpu/drm/i915/i915_trace.h
@@ -80,28 +80,6 @@ TRACE_EVENT(i915_gem_object_change_domain,
 		      __entry->read_domains, __entry->write_domain)
 );
 
-TRACE_EVENT(i915_gem_object_get_fence,
-
-	    TP_PROTO(struct drm_i915_gem_object *obj, int fence, int tiling_mode),
-
-	    TP_ARGS(obj, fence, tiling_mode),
-
-	    TP_STRUCT__entry(
-			     __field(struct drm_i915_gem_object *, obj)
-			     __field(int, fence)
-			     __field(int, tiling_mode)
-			     ),
-
-	    TP_fast_assign(
-			   __entry->obj = obj;
-			   __entry->fence = fence;
-			   __entry->tiling_mode = tiling_mode;
-			   ),
-
-	    TP_printk("obj=%p, fence=%d, tiling=%d",
-		      __entry->obj, __entry->fence, __entry->tiling_mode)
-);
-
 DECLARE_EVENT_CLASS(i915_gem_object,
 
 	    TP_PROTO(struct drm_i915_gem_object *obj),