On Mon, Nov 25, 2013 at 9:42 AM, Christian König deathsimple@vodafone.de wrote:
From: Christian König christian.koenig@amd.com
Signed-off-by: Christian König christian.koenig@amd.com
Applied. thanks! I fixed the %x argument size warnings in the second patch.
Alex
drivers/gpu/drm/radeon/radeon_gart.c | 2 ++ drivers/gpu/drm/radeon/radeon_trace.h | 15 +++++++++++++++ 2 files changed, 17 insertions(+)
diff --git a/drivers/gpu/drm/radeon/radeon_gart.c b/drivers/gpu/drm/radeon/radeon_gart.c index 3044e50..aa8f778 100644 --- a/drivers/gpu/drm/radeon/radeon_gart.c +++ b/drivers/gpu/drm/radeon/radeon_gart.c @@ -29,6 +29,7 @@ #include <drm/radeon_drm.h> #include "radeon.h" #include "radeon_reg.h" +#include "radeon_trace.h"
/*
- GART
@@ -737,6 +738,7 @@ struct radeon_fence *radeon_vm_grab_id(struct radeon_device *rdev, for (i = 0; i < 2; ++i) { if (choices[i]) { vm->id = choices[i];
trace_radeon_vm_grab_id(vm->id, ring); return rdev->vm_manager.active[choices[i]]; } }diff --git a/drivers/gpu/drm/radeon/radeon_trace.h b/drivers/gpu/drm/radeon/radeon_trace.h index 9f0e181..8c13aec 100644 --- a/drivers/gpu/drm/radeon/radeon_trace.h +++ b/drivers/gpu/drm/radeon/radeon_trace.h @@ -47,6 +47,21 @@ TRACE_EVENT(radeon_cs, __entry->fences) );
+TRACE_EVENT(radeon_vm_grab_id,
TP_PROTO(unsigned vmid, int ring),TP_ARGS(vmid, ring),TP_STRUCT__entry(__field(u32, vmid)__field(u32, ring)),TP_fast_assign(__entry->vmid = vmid;__entry->ring = ring;),TP_printk("vmid=%u, ring=%u", __entry->vmid, __entry->ring)+);
TRACE_EVENT(radeon_vm_set_page, TP_PROTO(uint64_t pe, uint64_t addr, unsigned count, uint32_t incr, uint32_t flags), -- 1.8.1.2
dri-devel mailing list dri-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/dri-devel