* [PATCH 1/2] drm/i915: Fix some tracepoints to capture full 64b
@ 2017-10-03 12:50 Chris Wilson
2017-10-03 12:50 ` [PATCH 2/2] drm/i915: Remove defunct trace points Chris Wilson
` (2 more replies)
0 siblings, 3 replies; 9+ messages in thread
From: Chris Wilson @ 2017-10-03 12:50 UTC (permalink / raw)
To: intel-gfx
The tracepoints need some tlc, in particular we've neglected to update
them for the 64b era.
v2: Prefix hexadecimal output with 0x.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
---
drivers/gpu/drm/i915/i915_trace.h | 44 +++++++++++++++++++--------------------
1 file changed, 22 insertions(+), 22 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_trace.h b/drivers/gpu/drm/i915/i915_trace.h
index 92f4c5bb7aa7..cca73636a747 100644
--- a/drivers/gpu/drm/i915/i915_trace.h
+++ b/drivers/gpu/drm/i915/i915_trace.h
@@ -345,7 +345,7 @@ TRACE_EVENT(i915_gem_object_create,
TP_STRUCT__entry(
__field(struct drm_i915_gem_object *, obj)
- __field(u32, size)
+ __field(u64, size)
),
TP_fast_assign(
@@ -353,7 +353,7 @@ TRACE_EVENT(i915_gem_object_create,
__entry->size = obj->base.size;
),
- TP_printk("obj=%p, size=%u", __entry->obj, __entry->size)
+ TP_printk("obj=%p, size=0x%llx", __entry->obj, __entry->size)
);
TRACE_EVENT(i915_gem_shrink,
@@ -384,7 +384,7 @@ TRACE_EVENT(i915_vma_bind,
__field(struct drm_i915_gem_object *, obj)
__field(struct i915_address_space *, vm)
__field(u64, offset)
- __field(u32, size)
+ __field(u64, size)
__field(unsigned, flags)
),
@@ -396,7 +396,7 @@ TRACE_EVENT(i915_vma_bind,
__entry->flags = flags;
),
- TP_printk("obj=%p, offset=%016llx size=%x%s vm=%p",
+ TP_printk("obj=%p, offset=0x%016llx size=0x%llx%s vm=%p",
__entry->obj, __entry->offset, __entry->size,
__entry->flags & PIN_MAPPABLE ? ", mappable" : "",
__entry->vm)
@@ -410,7 +410,7 @@ TRACE_EVENT(i915_vma_unbind,
__field(struct drm_i915_gem_object *, obj)
__field(struct i915_address_space *, vm)
__field(u64, offset)
- __field(u32, size)
+ __field(u64, size)
),
TP_fast_assign(
@@ -420,18 +420,18 @@ TRACE_EVENT(i915_vma_unbind,
__entry->size = vma->node.size;
),
- TP_printk("obj=%p, offset=%016llx size=%x vm=%p",
+ TP_printk("obj=%p, offset=0x%016llx size=0x%llx vm=%p",
__entry->obj, __entry->offset, __entry->size, __entry->vm)
);
TRACE_EVENT(i915_gem_object_pwrite,
- TP_PROTO(struct drm_i915_gem_object *obj, u32 offset, u32 len),
+ TP_PROTO(struct drm_i915_gem_object *obj, u64 offset, u64 len),
TP_ARGS(obj, offset, len),
TP_STRUCT__entry(
__field(struct drm_i915_gem_object *, obj)
- __field(u32, offset)
- __field(u32, len)
+ __field(u64, offset)
+ __field(u64, len)
),
TP_fast_assign(
@@ -440,18 +440,18 @@ TRACE_EVENT(i915_gem_object_pwrite,
__entry->len = len;
),
- TP_printk("obj=%p, offset=%u, len=%u",
+ TP_printk("obj=%p, offset=0x%llx, len=0x%llx",
__entry->obj, __entry->offset, __entry->len)
);
TRACE_EVENT(i915_gem_object_pread,
- TP_PROTO(struct drm_i915_gem_object *obj, u32 offset, u32 len),
+ TP_PROTO(struct drm_i915_gem_object *obj, u64 offset, u64 len),
TP_ARGS(obj, offset, len),
TP_STRUCT__entry(
__field(struct drm_i915_gem_object *, obj)
- __field(u32, offset)
- __field(u32, len)
+ __field(u64, offset)
+ __field(u64, len)
),
TP_fast_assign(
@@ -460,17 +460,17 @@ TRACE_EVENT(i915_gem_object_pread,
__entry->len = len;
),
- TP_printk("obj=%p, offset=%u, len=%u",
+ TP_printk("obj=%p, offset=0x%llx, len=0x%llx",
__entry->obj, __entry->offset, __entry->len)
);
TRACE_EVENT(i915_gem_object_fault,
- TP_PROTO(struct drm_i915_gem_object *obj, u32 index, bool gtt, bool write),
+ 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(u32, index)
+ __field(u64, index)
__field(bool, gtt)
__field(bool, write)
),
@@ -482,7 +482,7 @@ TRACE_EVENT(i915_gem_object_fault,
__entry->write = write;
),
- TP_printk("obj=%p, %s index=%u %s",
+ TP_printk("obj=%p, %s index=%llu %s",
__entry->obj,
__entry->gtt ? "GTT" : "CPU",
__entry->index,
@@ -515,14 +515,14 @@ DEFINE_EVENT(i915_gem_object, i915_gem_object_destroy,
);
TRACE_EVENT(i915_gem_evict,
- TP_PROTO(struct i915_address_space *vm, u32 size, u32 align, unsigned int flags),
+ TP_PROTO(struct i915_address_space *vm, u64 size, u64 align, unsigned int flags),
TP_ARGS(vm, size, align, flags),
TP_STRUCT__entry(
__field(u32, dev)
__field(struct i915_address_space *, vm)
- __field(u32, size)
- __field(u32, align)
+ __field(u64, size)
+ __field(u64, align)
__field(unsigned int, flags)
),
@@ -534,7 +534,7 @@ TRACE_EVENT(i915_gem_evict,
__entry->flags = flags;
),
- TP_printk("dev=%d, vm=%p, size=%d, align=%d %s",
+ TP_printk("dev=%d, vm=%p, size=0x%llx, align=0x%llx %s",
__entry->dev, __entry->vm, __entry->size, __entry->align,
__entry->flags & PIN_MAPPABLE ? ", mappable" : "")
);
@@ -593,7 +593,7 @@ TRACE_EVENT(i915_gem_evict_node,
__entry->flags = flags;
),
- TP_printk("dev=%d, vm=%p, start=%llx size=%llx, color=%lx, flags=%x",
+ TP_printk("dev=%d, vm=%p, start=0x%llx size=0x%llx, color=0x%lx, flags=%x",
__entry->dev, __entry->vm,
__entry->start, __entry->size,
__entry->color, __entry->flags)
--
2.14.2
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 2/2] drm/i915: Remove defunct trace points
2017-10-03 12:50 [PATCH 1/2] drm/i915: Fix some tracepoints to capture full 64b Chris Wilson
@ 2017-10-03 12:50 ` Chris Wilson
2017-10-04 9:39 ` Tvrtko Ursulin
2017-10-03 13:12 ` ✗ Fi.CI.BAT: failure for series starting with [1/2] drm/i915: Fix some tracepoints to capture full 64b Patchwork
2017-10-04 8:32 ` [PATCH 1/2] " Tvrtko Ursulin
2 siblings, 1 reply; 9+ messages in thread
From: Chris Wilson @ 2017-10-03 12:50 UTC (permalink / raw)
To: intel-gfx
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@chris-wilson.co.uk>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
---
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 cca73636a747..9cab91ddeb79 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)
+);
+
TRACE_EVENT(i915_gem_ring_sync_to,
TP_PROTO(struct drm_i915_gem_request *to,
struct drm_i915_gem_request *from),
@@ -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),
--
2.14.2
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 9+ messages in thread
* ✗ Fi.CI.BAT: failure for series starting with [1/2] drm/i915: Fix some tracepoints to capture full 64b
2017-10-03 12:50 [PATCH 1/2] drm/i915: Fix some tracepoints to capture full 64b Chris Wilson
2017-10-03 12:50 ` [PATCH 2/2] drm/i915: Remove defunct trace points Chris Wilson
@ 2017-10-03 13:12 ` Patchwork
2017-10-04 8:32 ` [PATCH 1/2] " Tvrtko Ursulin
2 siblings, 0 replies; 9+ messages in thread
From: Patchwork @ 2017-10-03 13:12 UTC (permalink / raw)
To: Chris Wilson; +Cc: intel-gfx
== Series Details ==
Series: series starting with [1/2] drm/i915: Fix some tracepoints to capture full 64b
URL : https://patchwork.freedesktop.org/series/31318/
State : failure
== Summary ==
Series 31318v1 series starting with [1/2] drm/i915: Fix some tracepoints to capture full 64b
https://patchwork.freedesktop.org/api/1.0/series/31318/revisions/1/mbox/
Test chamelium:
Subgroup hdmi-crc-fast:
pass -> DMESG-WARN (fi-skl-6700k) fdo#103019
Test kms_pipe_crc_basic:
Subgroup suspend-read-crc-pipe-c:
pass -> FAIL (fi-ivb-3520m)
fdo#103019 https://bugs.freedesktop.org/show_bug.cgi?id=103019
fi-bdw-5557u total:289 pass:268 dwarn:0 dfail:0 fail:0 skip:21 time:457s
fi-bdw-gvtdvm total:289 pass:265 dwarn:0 dfail:0 fail:0 skip:24 time:478s
fi-blb-e6850 total:289 pass:224 dwarn:1 dfail:0 fail:0 skip:64 time:391s
fi-bsw-n3050 total:289 pass:243 dwarn:0 dfail:0 fail:0 skip:46 time:581s
fi-bwr-2160 total:289 pass:184 dwarn:0 dfail:0 fail:0 skip:105 time:290s
fi-bxt-dsi total:289 pass:259 dwarn:0 dfail:0 fail:0 skip:30 time:533s
fi-bxt-j4205 total:289 pass:260 dwarn:0 dfail:0 fail:0 skip:29 time:536s
fi-byt-j1900 total:289 pass:254 dwarn:1 dfail:0 fail:0 skip:34 time:549s
fi-byt-n2820 total:289 pass:250 dwarn:1 dfail:0 fail:0 skip:38 time:540s
fi-cfl-s total:289 pass:256 dwarn:1 dfail:0 fail:0 skip:32 time:552s
fi-cnl-y total:289 pass:261 dwarn:1 dfail:0 fail:0 skip:27 time:641s
fi-elk-e7500 total:289 pass:230 dwarn:0 dfail:0 fail:0 skip:59 time:441s
fi-glk-1 total:289 pass:261 dwarn:0 dfail:0 fail:0 skip:28 time:599s
fi-hsw-4770 total:289 pass:263 dwarn:0 dfail:0 fail:0 skip:26 time:447s
fi-hsw-4770r total:289 pass:263 dwarn:0 dfail:0 fail:0 skip:26 time:422s
fi-ilk-650 total:289 pass:229 dwarn:0 dfail:0 fail:0 skip:60 time:469s
fi-ivb-3520m total:289 pass:260 dwarn:0 dfail:0 fail:1 skip:28 time:495s
fi-ivb-3770 total:289 pass:261 dwarn:0 dfail:0 fail:0 skip:28 time:475s
fi-kbl-7500u total:289 pass:264 dwarn:1 dfail:0 fail:0 skip:24 time:506s
fi-kbl-7560u total:289 pass:270 dwarn:0 dfail:0 fail:0 skip:19 time:580s
fi-kbl-7567u total:289 pass:265 dwarn:4 dfail:0 fail:0 skip:20 time:495s
fi-kbl-r total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:586s
fi-pnv-d510 total:289 pass:223 dwarn:1 dfail:0 fail:0 skip:65 time:659s
fi-skl-6260u total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:476s
fi-skl-6700k total:289 pass:264 dwarn:1 dfail:0 fail:0 skip:24 time:540s
fi-skl-6770hq total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:522s
fi-skl-gvtdvm total:289 pass:266 dwarn:0 dfail:0 fail:0 skip:23 time:480s
fi-snb-2520m total:289 pass:251 dwarn:0 dfail:0 fail:0 skip:38 time:588s
fi-snb-2600 total:289 pass:250 dwarn:0 dfail:0 fail:0 skip:39 time:439s
79f82050a2456244c7a511905075bb3b50d30b5e drm-tip: 2017y-10m-03d-11h-31m-30s UTC integration manifest
e35abea1e235 drm/i915: Remove defunct trace points
c0f029e78a1d drm/i915: Fix some tracepoints to capture full 64b
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_5878/
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 1/2] drm/i915: Fix some tracepoints to capture full 64b
2017-10-03 12:50 [PATCH 1/2] drm/i915: Fix some tracepoints to capture full 64b Chris Wilson
2017-10-03 12:50 ` [PATCH 2/2] drm/i915: Remove defunct trace points Chris Wilson
2017-10-03 13:12 ` ✗ Fi.CI.BAT: failure for series starting with [1/2] drm/i915: Fix some tracepoints to capture full 64b Patchwork
@ 2017-10-04 8:32 ` Tvrtko Ursulin
2 siblings, 0 replies; 9+ messages in thread
From: Tvrtko Ursulin @ 2017-10-04 8:32 UTC (permalink / raw)
To: Chris Wilson, intel-gfx
On 03/10/2017 13:50, Chris Wilson wrote:
> The tracepoints need some tlc, in particular we've neglected to update
> them for the 64b era.
>
> v2: Prefix hexadecimal output with 0x.
>
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> ---
> drivers/gpu/drm/i915/i915_trace.h | 44 +++++++++++++++++++--------------------
> 1 file changed, 22 insertions(+), 22 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_trace.h b/drivers/gpu/drm/i915/i915_trace.h
> index 92f4c5bb7aa7..cca73636a747 100644
> --- a/drivers/gpu/drm/i915/i915_trace.h
> +++ b/drivers/gpu/drm/i915/i915_trace.h
> @@ -345,7 +345,7 @@ TRACE_EVENT(i915_gem_object_create,
>
> TP_STRUCT__entry(
> __field(struct drm_i915_gem_object *, obj)
> - __field(u32, size)
> + __field(u64, size)
> ),
>
> TP_fast_assign(
> @@ -353,7 +353,7 @@ TRACE_EVENT(i915_gem_object_create,
> __entry->size = obj->base.size;
> ),
>
> - TP_printk("obj=%p, size=%u", __entry->obj, __entry->size)
> + TP_printk("obj=%p, size=0x%llx", __entry->obj, __entry->size)
> );
>
> TRACE_EVENT(i915_gem_shrink,
> @@ -384,7 +384,7 @@ TRACE_EVENT(i915_vma_bind,
> __field(struct drm_i915_gem_object *, obj)
> __field(struct i915_address_space *, vm)
> __field(u64, offset)
> - __field(u32, size)
> + __field(u64, size)
> __field(unsigned, flags)
> ),
>
> @@ -396,7 +396,7 @@ TRACE_EVENT(i915_vma_bind,
> __entry->flags = flags;
> ),
>
> - TP_printk("obj=%p, offset=%016llx size=%x%s vm=%p",
> + TP_printk("obj=%p, offset=0x%016llx size=0x%llx%s vm=%p",
> __entry->obj, __entry->offset, __entry->size,
> __entry->flags & PIN_MAPPABLE ? ", mappable" : "",
> __entry->vm)
> @@ -410,7 +410,7 @@ TRACE_EVENT(i915_vma_unbind,
> __field(struct drm_i915_gem_object *, obj)
> __field(struct i915_address_space *, vm)
> __field(u64, offset)
> - __field(u32, size)
> + __field(u64, size)
> ),
>
> TP_fast_assign(
> @@ -420,18 +420,18 @@ TRACE_EVENT(i915_vma_unbind,
> __entry->size = vma->node.size;
> ),
>
> - TP_printk("obj=%p, offset=%016llx size=%x vm=%p",
> + TP_printk("obj=%p, offset=0x%016llx size=0x%llx vm=%p",
> __entry->obj, __entry->offset, __entry->size, __entry->vm)
> );
>
> TRACE_EVENT(i915_gem_object_pwrite,
> - TP_PROTO(struct drm_i915_gem_object *obj, u32 offset, u32 len),
> + TP_PROTO(struct drm_i915_gem_object *obj, u64 offset, u64 len),
> TP_ARGS(obj, offset, len),
>
> TP_STRUCT__entry(
> __field(struct drm_i915_gem_object *, obj)
> - __field(u32, offset)
> - __field(u32, len)
> + __field(u64, offset)
> + __field(u64, len)
> ),
>
> TP_fast_assign(
> @@ -440,18 +440,18 @@ TRACE_EVENT(i915_gem_object_pwrite,
> __entry->len = len;
> ),
>
> - TP_printk("obj=%p, offset=%u, len=%u",
> + TP_printk("obj=%p, offset=0x%llx, len=0x%llx",
> __entry->obj, __entry->offset, __entry->len)
> );
>
> TRACE_EVENT(i915_gem_object_pread,
> - TP_PROTO(struct drm_i915_gem_object *obj, u32 offset, u32 len),
> + TP_PROTO(struct drm_i915_gem_object *obj, u64 offset, u64 len),
> TP_ARGS(obj, offset, len),
>
> TP_STRUCT__entry(
> __field(struct drm_i915_gem_object *, obj)
> - __field(u32, offset)
> - __field(u32, len)
> + __field(u64, offset)
> + __field(u64, len)
> ),
>
> TP_fast_assign(
> @@ -460,17 +460,17 @@ TRACE_EVENT(i915_gem_object_pread,
> __entry->len = len;
> ),
>
> - TP_printk("obj=%p, offset=%u, len=%u",
> + TP_printk("obj=%p, offset=0x%llx, len=0x%llx",
> __entry->obj, __entry->offset, __entry->len)
> );
>
> TRACE_EVENT(i915_gem_object_fault,
> - TP_PROTO(struct drm_i915_gem_object *obj, u32 index, bool gtt, bool write),
> + 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(u32, index)
> + __field(u64, index)
> __field(bool, gtt)
> __field(bool, write)
> ),
> @@ -482,7 +482,7 @@ TRACE_EVENT(i915_gem_object_fault,
> __entry->write = write;
> ),
>
> - TP_printk("obj=%p, %s index=%u %s",
> + TP_printk("obj=%p, %s index=%llu %s",
> __entry->obj,
> __entry->gtt ? "GTT" : "CPU",
> __entry->index,
> @@ -515,14 +515,14 @@ DEFINE_EVENT(i915_gem_object, i915_gem_object_destroy,
> );
>
> TRACE_EVENT(i915_gem_evict,
> - TP_PROTO(struct i915_address_space *vm, u32 size, u32 align, unsigned int flags),
> + TP_PROTO(struct i915_address_space *vm, u64 size, u64 align, unsigned int flags),
> TP_ARGS(vm, size, align, flags),
>
> TP_STRUCT__entry(
> __field(u32, dev)
> __field(struct i915_address_space *, vm)
> - __field(u32, size)
> - __field(u32, align)
> + __field(u64, size)
> + __field(u64, align)
> __field(unsigned int, flags)
> ),
>
> @@ -534,7 +534,7 @@ TRACE_EVENT(i915_gem_evict,
> __entry->flags = flags;
> ),
>
> - TP_printk("dev=%d, vm=%p, size=%d, align=%d %s",
> + TP_printk("dev=%d, vm=%p, size=0x%llx, align=0x%llx %s",
> __entry->dev, __entry->vm, __entry->size, __entry->align,
> __entry->flags & PIN_MAPPABLE ? ", mappable" : "")
> );
> @@ -593,7 +593,7 @@ TRACE_EVENT(i915_gem_evict_node,
> __entry->flags = flags;
> ),
>
> - TP_printk("dev=%d, vm=%p, start=%llx size=%llx, color=%lx, flags=%x",
> + TP_printk("dev=%d, vm=%p, start=0x%llx size=0x%llx, color=0x%lx, flags=%x",
> __entry->dev, __entry->vm,
> __entry->start, __entry->size,
> __entry->color, __entry->flags)
>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Regards,
Tvrtko
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 2/2] drm/i915: Remove defunct trace points
2017-10-03 12:50 ` [PATCH 2/2] drm/i915: Remove defunct trace points Chris Wilson
@ 2017-10-04 9:39 ` Tvrtko Ursulin
2017-10-04 14:35 ` Chris Wilson
0 siblings, 1 reply; 9+ messages in thread
From: Tvrtko Ursulin @ 2017-10-04 9:39 UTC (permalink / raw)
To: Chris Wilson, intel-gfx
On 03/10/2017 13:50, 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@chris-wilson.co.uk>
> Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
> ---
> 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 cca73636a747..9cab91ddeb79 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)
> +);
> +
> TRACE_EVENT(i915_gem_ring_sync_to,
> TP_PROTO(struct drm_i915_gem_request *to,
> struct drm_i915_gem_request *from),
> @@ -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),
>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Regards,
Tvrtko
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 2/2] drm/i915: Remove defunct trace points
2017-10-04 9:39 ` Tvrtko Ursulin
@ 2017-10-04 14:35 ` Chris Wilson
0 siblings, 0 replies; 9+ messages in thread
From: Chris Wilson @ 2017-10-04 14:35 UTC (permalink / raw)
To: Tvrtko Ursulin, intel-gfx
Quoting Tvrtko Ursulin (2017-10-04 10:39:08)
>
> On 03/10/2017 13:50, 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@chris-wilson.co.uk>
> > Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
> Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Ta, pushed.
-Chris
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 2/2] drm/i915: Remove defunct trace points
2017-05-15 10:31 ` Tvrtko Ursulin
@ 2017-10-03 12:35 ` Chris Wilson
0 siblings, 0 replies; 9+ messages in thread
From: Chris Wilson @ 2017-10-03 12:35 UTC (permalink / raw)
To: Tvrtko Ursulin, intel-gfx
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@chris-wilson.co.uk>
> > ---
> > 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@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 2/2] drm/i915: Remove defunct trace points
2017-05-12 20:21 ` [PATCH 2/2] drm/i915: Remove defunct trace points Chris Wilson
@ 2017-05-15 10:31 ` Tvrtko Ursulin
2017-10-03 12:35 ` Chris Wilson
0 siblings, 1 reply; 9+ messages in thread
From: Tvrtko Ursulin @ 2017-05-15 10:31 UTC (permalink / raw)
To: Chris Wilson, intel-gfx
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@chris-wilson.co.uk>
> ---
> 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?
> +
> TRACE_EVENT(i915_gem_ring_sync_to,
> TP_PROTO(struct drm_i915_gem_request *to,
> struct drm_i915_gem_request *from),
> @@ -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),
>
Anyway,
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Regards,
Tvrtko
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 2/2] drm/i915: Remove defunct trace points
2017-05-12 20:21 Chris Wilson
@ 2017-05-12 20:21 ` Chris Wilson
2017-05-15 10:31 ` Tvrtko Ursulin
0 siblings, 1 reply; 9+ messages in thread
From: Chris Wilson @ 2017-05-12 20:21 UTC (permalink / raw)
To: intel-gfx
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@chris-wilson.co.uk>
---
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)
+);
+
TRACE_EVENT(i915_gem_ring_sync_to,
TP_PROTO(struct drm_i915_gem_request *to,
struct drm_i915_gem_request *from),
@@ -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),
--
2.11.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 9+ messages in thread
end of thread, other threads:[~2017-10-04 14:35 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-10-03 12:50 [PATCH 1/2] drm/i915: Fix some tracepoints to capture full 64b Chris Wilson
2017-10-03 12:50 ` [PATCH 2/2] drm/i915: Remove defunct trace points Chris Wilson
2017-10-04 9:39 ` Tvrtko Ursulin
2017-10-04 14:35 ` Chris Wilson
2017-10-03 13:12 ` ✗ Fi.CI.BAT: failure for series starting with [1/2] drm/i915: Fix some tracepoints to capture full 64b Patchwork
2017-10-04 8:32 ` [PATCH 1/2] " Tvrtko Ursulin
-- strict thread matches above, loose matches on Subject: below --
2017-05-12 20:21 Chris Wilson
2017-05-12 20:21 ` [PATCH 2/2] drm/i915: Remove defunct trace points Chris Wilson
2017-05-15 10:31 ` Tvrtko Ursulin
2017-10-03 12:35 ` Chris Wilson
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.