Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
drm/radeon: add radeon_vm_bo_update trace point
Also rename the function to better reflect what it is doing.
agd5f: fix argument size warning
Signed-off-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
authored by
Christian König
and committed by
Alex Deucher
9c57a6bd
84d597b7
+32
-12
+4
-4
drivers/gpu/drm/radeon/radeon.h
+4
-4
drivers/gpu/drm/radeon/radeon.h
···
2710
2710
struct radeon_vm *vm,
2711
2711
struct radeon_fence *fence);
2712
2712
uint64_t radeon_vm_map_gart(struct radeon_device *rdev, uint64_t addr);
2713
-
int radeon_vm_bo_update_pte(struct radeon_device *rdev,
2714
-
struct radeon_vm *vm,
2715
-
struct radeon_bo *bo,
2716
-
struct ttm_mem_reg *mem);
2713
+
int radeon_vm_bo_update(struct radeon_device *rdev,
2714
+
struct radeon_vm *vm,
2715
+
struct radeon_bo *bo,
2716
+
struct ttm_mem_reg *mem);
2717
2717
void radeon_vm_bo_invalidate(struct radeon_device *rdev,
2718
2718
struct radeon_bo *bo);
2719
2719
struct radeon_bo_va *radeon_vm_bo_find(struct radeon_vm *vm,
+2
-2
drivers/gpu/drm/radeon/radeon_cs.c
+2
-2
drivers/gpu/drm/radeon/radeon_cs.c
···
360
360
struct radeon_bo *bo;
361
361
int r;
362
362
363
-
r = radeon_vm_bo_update_pte(rdev, vm, rdev->ring_tmp_bo.bo, &rdev->ring_tmp_bo.bo->tbo.mem);
363
+
r = radeon_vm_bo_update(rdev, vm, rdev->ring_tmp_bo.bo, &rdev->ring_tmp_bo.bo->tbo.mem);
364
364
if (r) {
365
365
return r;
366
366
}
367
367
list_for_each_entry(lobj, &parser->validated, tv.head) {
368
368
bo = lobj->bo;
369
-
r = radeon_vm_bo_update_pte(parser->rdev, vm, bo, &bo->tbo.mem);
369
+
r = radeon_vm_bo_update(parser->rdev, vm, bo, &bo->tbo.mem);
370
370
if (r) {
371
371
return r;
372
372
}
+8
-6
drivers/gpu/drm/radeon/radeon_gart.c
+8
-6
drivers/gpu/drm/radeon/radeon_gart.c
···
1118
1118
}
1119
1119
1120
1120
/**
1121
-
* radeon_vm_bo_update_pte - map a bo into the vm page table
1121
+
* radeon_vm_bo_update - map a bo into the vm page table
1122
1122
*
1123
1123
* @rdev: radeon_device pointer
1124
1124
* @vm: requested vm
···
1130
1130
*
1131
1131
* Object have to be reserved & global and local mutex must be locked!
1132
1132
*/
1133
-
int radeon_vm_bo_update_pte(struct radeon_device *rdev,
1134
-
struct radeon_vm *vm,
1135
-
struct radeon_bo *bo,
1136
-
struct ttm_mem_reg *mem)
1133
+
int radeon_vm_bo_update(struct radeon_device *rdev,
1134
+
struct radeon_vm *vm,
1135
+
struct radeon_bo *bo,
1136
+
struct ttm_mem_reg *mem)
1137
1137
{
1138
1138
struct radeon_ib ib;
1139
1139
struct radeon_bo_va *bo_va;
···
1177
1177
addr = 0;
1178
1178
bo_va->valid = false;
1179
1179
}
1180
+
1181
+
trace_radeon_vm_bo_update(bo_va);
1180
1182
1181
1183
nptes = radeon_bo_ngpu_pages(bo);
1182
1184
···
1261
1259
mutex_lock(&rdev->vm_manager.lock);
1262
1260
mutex_lock(&bo_va->vm->mutex);
1263
1261
if (bo_va->soffset) {
1264
-
r = radeon_vm_bo_update_pte(rdev, bo_va->vm, bo_va->bo, NULL);
1262
+
r = radeon_vm_bo_update(rdev, bo_va->vm, bo_va->bo, NULL);
1265
1263
}
1266
1264
mutex_unlock(&rdev->vm_manager.lock);
1267
1265
list_del(&bo_va->vm_list);
+18
drivers/gpu/drm/radeon/radeon_trace.h
+18
drivers/gpu/drm/radeon/radeon_trace.h
···
62
62
TP_printk("vmid=%u, ring=%u", __entry->vmid, __entry->ring)
63
63
);
64
64
65
+
TRACE_EVENT(radeon_vm_bo_update,
66
+
TP_PROTO(struct radeon_bo_va *bo_va),
67
+
TP_ARGS(bo_va),
68
+
TP_STRUCT__entry(
69
+
__field(u64, soffset)
70
+
__field(u64, eoffset)
71
+
__field(u32, flags)
72
+
),
73
+
74
+
TP_fast_assign(
75
+
__entry->soffset = bo_va->soffset;
76
+
__entry->eoffset = bo_va->eoffset;
77
+
__entry->flags = bo_va->flags;
78
+
),
79
+
TP_printk("soffs=%010llx, eoffs=%010llx, flags=%08x",
80
+
__entry->soffset, __entry->eoffset, __entry->flags)
81
+
);
82
+
65
83
TRACE_EVENT(radeon_vm_set_page,
66
84
TP_PROTO(uint64_t pe, uint64_t addr, unsigned count,
67
85
uint32_t incr, uint32_t flags),