diff options
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_gart.c | 2 | ||||
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_trace.h | 15 |
2 files changed, 17 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_gart.c b/drivers/gpu/drm/radeon/radeon_gart.c index 3044e504f4ec..aa8f7782d295 100644 --- a/drivers/gpu/drm/radeon/radeon_gart.c +++ b/drivers/gpu/drm/radeon/radeon_gart.c | |||
| @@ -29,6 +29,7 @@ | |||
| 29 | #include <drm/radeon_drm.h> | 29 | #include <drm/radeon_drm.h> |
| 30 | #include "radeon.h" | 30 | #include "radeon.h" |
| 31 | #include "radeon_reg.h" | 31 | #include "radeon_reg.h" |
| 32 | #include "radeon_trace.h" | ||
| 32 | 33 | ||
| 33 | /* | 34 | /* |
| 34 | * GART | 35 | * GART |
| @@ -737,6 +738,7 @@ struct radeon_fence *radeon_vm_grab_id(struct radeon_device *rdev, | |||
| 737 | for (i = 0; i < 2; ++i) { | 738 | for (i = 0; i < 2; ++i) { |
| 738 | if (choices[i]) { | 739 | if (choices[i]) { |
| 739 | vm->id = choices[i]; | 740 | vm->id = choices[i]; |
| 741 | trace_radeon_vm_grab_id(vm->id, ring); | ||
| 740 | return rdev->vm_manager.active[choices[i]]; | 742 | return rdev->vm_manager.active[choices[i]]; |
| 741 | } | 743 | } |
| 742 | } | 744 | } |
diff --git a/drivers/gpu/drm/radeon/radeon_trace.h b/drivers/gpu/drm/radeon/radeon_trace.h index 9f0e18172b6e..8c13aeca59c9 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, | |||
| 47 | __entry->fences) | 47 | __entry->fences) |
| 48 | ); | 48 | ); |
| 49 | 49 | ||
| 50 | TRACE_EVENT(radeon_vm_grab_id, | ||
| 51 | TP_PROTO(unsigned vmid, int ring), | ||
| 52 | TP_ARGS(vmid, ring), | ||
| 53 | TP_STRUCT__entry( | ||
| 54 | __field(u32, vmid) | ||
| 55 | __field(u32, ring) | ||
| 56 | ), | ||
| 57 | |||
| 58 | TP_fast_assign( | ||
| 59 | __entry->vmid = vmid; | ||
| 60 | __entry->ring = ring; | ||
| 61 | ), | ||
| 62 | TP_printk("vmid=%u, ring=%u", __entry->vmid, __entry->ring) | ||
| 63 | ); | ||
| 64 | |||
| 50 | TRACE_EVENT(radeon_vm_set_page, | 65 | TRACE_EVENT(radeon_vm_set_page, |
| 51 | TP_PROTO(uint64_t pe, uint64_t addr, unsigned count, | 66 | TP_PROTO(uint64_t pe, uint64_t addr, unsigned count, |
| 52 | uint32_t incr, uint32_t flags), | 67 | uint32_t incr, uint32_t flags), |
