Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / gpu / drm / i915 / i915_trace.h

diff --git a/drivers/gpu/drm/i915/i915_trace.h b/drivers/gpu/drm/i915/i915_trace.h
index fea97a21cc1435a67a95563e786cf41a4acc7858..7f0fc3ed61aa73e49a8340d6e17673bdc3df2fe2 100644 (file)
--- a/drivers/gpu/drm/i915/i915_trace.h
+++ b/drivers/gpu/drm/i915/i915_trace.h
@@ -6,6 +6,7 @@
 #include <linux/tracepoint.h>
 
 #include <drm/drmP.h>
+#include "i915_drv.h"
 
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM i915
@@ -16,18 +17,18 @@
 
 TRACE_EVENT(i915_gem_object_create,
 
-           TP_PROTO(struct drm_gem_object *obj),
+           TP_PROTO(struct drm_i915_gem_object *obj),
 
            TP_ARGS(obj),
 
            TP_STRUCT__entry(
-                            __field(struct drm_gem_object *, obj)
+                            __field(struct drm_i915_gem_object *, obj)
                             __field(u32, size)
                             ),
 
            TP_fast_assign(
                           __entry->obj = obj;
-                          __entry->size = obj->size;
+                          __entry->size = obj->base.size;
                           ),
 
            TP_printk("obj=%p, size=%u", __entry->obj, __entry->size)
@@ -35,40 +36,43 @@ TRACE_EVENT(i915_gem_object_create,
 
 TRACE_EVENT(i915_gem_object_bind,
 
-           TP_PROTO(struct drm_gem_object *obj, u32 gtt_offset),
+           TP_PROTO(struct drm_i915_gem_object *obj, u32 gtt_offset, bool mappable),
 
-           TP_ARGS(obj, gtt_offset),
+           TP_ARGS(obj, gtt_offset, mappable),
 
            TP_STRUCT__entry(
-                            __field(struct drm_gem_object *, obj)
+                            __field(struct drm_i915_gem_object *, obj)
                             __field(u32, gtt_offset)
+                            __field(bool, mappable)
                             ),
 
            TP_fast_assign(
                           __entry->obj = obj;
                           __entry->gtt_offset = gtt_offset;
+                          __entry->mappable = mappable;
                           ),
 
-           TP_printk("obj=%p, gtt_offset=%08x",
-                     __entry->obj, __entry->gtt_offset)
+           TP_printk("obj=%p, gtt_offset=%08x%s",
+                     __entry->obj, __entry->gtt_offset,
+                     __entry->mappable ? ", mappable" : "")
 );
 
 TRACE_EVENT(i915_gem_object_change_domain,
 
-           TP_PROTO(struct drm_gem_object *obj, uint32_t old_read_domains, uint32_t old_write_domain),
+           TP_PROTO(struct drm_i915_gem_object *obj, uint32_t old_read_domains, uint32_t old_write_domain),
 
            TP_ARGS(obj, old_read_domains, old_write_domain),
 
            TP_STRUCT__entry(
-                            __field(struct drm_gem_object *, obj)
+                            __field(struct drm_i915_gem_object *, obj)
                             __field(u32, read_domains)
                             __field(u32, write_domain)
                             ),
 
            TP_fast_assign(
                           __entry->obj = obj;
-                          __entry->read_domains = obj->read_domains | (old_read_domains << 16);
-                          __entry->write_domain = obj->write_domain | (old_write_domain << 16);
+                          __entry->read_domains = obj->base.read_domains | (old_read_domains << 16);
+                          __entry->write_domain = obj->base.write_domain | (old_write_domain << 16);
                           ),
 
            TP_printk("obj=%p, read=%04x, write=%04x",
@@ -76,36 +80,14 @@ TRACE_EVENT(i915_gem_object_change_domain,
                      __entry->read_domains, __entry->write_domain)
 );
 
-TRACE_EVENT(i915_gem_object_get_fence,
-
-           TP_PROTO(struct drm_gem_object *obj, int fence, int tiling_mode),
-
-           TP_ARGS(obj, fence, tiling_mode),
-
-           TP_STRUCT__entry(
-                            __field(struct drm_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_gem_object *obj),
+           TP_PROTO(struct drm_i915_gem_object *obj),
 
            TP_ARGS(obj),
 
            TP_STRUCT__entry(
-                            __field(struct drm_gem_object *, obj)
+                            __field(struct drm_i915_gem_object *, obj)
                             ),
 
            TP_fast_assign(
@@ -117,21 +99,21 @@ DECLARE_EVENT_CLASS(i915_gem_object,
 
 DEFINE_EVENT(i915_gem_object, i915_gem_object_clflush,
 
-           TP_PROTO(struct drm_gem_object *obj),
+           TP_PROTO(struct drm_i915_gem_object *obj),
 
            TP_ARGS(obj)
 );
 
 DEFINE_EVENT(i915_gem_object, i915_gem_object_unbind,
 
-           TP_PROTO(struct drm_gem_object *obj),
+           TP_PROTO(struct drm_i915_gem_object *obj),
 
            TP_ARGS(obj)
 );
 
 DEFINE_EVENT(i915_gem_object, i915_gem_object_destroy,
 
-           TP_PROTO(struct drm_gem_object *obj),
+           TP_PROTO(struct drm_i915_gem_object *obj),
 
            TP_ARGS(obj)
 );
@@ -263,13 +245,13 @@ DEFINE_EVENT(i915_ring, i915_ring_wait_end,
 );
 
 TRACE_EVENT(i915_flip_request,
-           TP_PROTO(int plane, struct drm_gem_object *obj),
+           TP_PROTO(int plane, struct drm_i915_gem_object *obj),
 
            TP_ARGS(plane, obj),
 
            TP_STRUCT__entry(
                    __field(int, plane)
-                   __field(struct drm_gem_object *, obj)
+                   __field(struct drm_i915_gem_object *, obj)
                    ),
 
            TP_fast_assign(
@@ -281,13 +263,13 @@ TRACE_EVENT(i915_flip_request,
 );
 
 TRACE_EVENT(i915_flip_complete,
-           TP_PROTO(int plane, struct drm_gem_object *obj),
+           TP_PROTO(int plane, struct drm_i915_gem_object *obj),
 
            TP_ARGS(plane, obj),
 
            TP_STRUCT__entry(
                    __field(int, plane)
-                   __field(struct drm_gem_object *, obj)
+                   __field(struct drm_i915_gem_object *, obj)
                    ),
 
            TP_fast_assign(
@@ -298,6 +280,29 @@ TRACE_EVENT(i915_flip_complete,
            TP_printk("plane=%d, obj=%p", __entry->plane, __entry->obj)
 );
 
+TRACE_EVENT(i915_reg_rw,
+           TP_PROTO(int cmd, uint32_t reg, uint64_t val, int len),
+
+           TP_ARGS(cmd, reg, val, len),
+
+           TP_STRUCT__entry(
+                   __field(int, cmd)
+                   __field(uint32_t, reg)
+                   __field(uint64_t, val)
+                   __field(int, len)
+                   ),
+
+           TP_fast_assign(
+                   __entry->cmd = cmd;
+                   __entry->reg = reg;
+                   __entry->val = (uint64_t)val;
+                   __entry->len = len;
+                   ),
+
+           TP_printk("cmd=%c, reg=0x%x, val=0x%llx, len=%d",
+                     __entry->cmd, __entry->reg, __entry->val, __entry->len)
+);
+
 #endif /* _I915_TRACE_H_ */
 
 /* This part must be outside protection */