aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/amd/amdgpu
diff options
context:
space:
mode:
authorChristian König <christian.koenig@amd.com>2017-06-28 05:06:52 -0400
committerAlex Deucher <alexander.deucher@amd.com>2017-07-14 11:06:01 -0400
commit663ebbf63180ec6fb67d732ff3a8335c9d266c00 (patch)
tree7309c3e7162799711869e5d430aaa214f0748742 /drivers/gpu/drm/amd/amdgpu
parent5327dd8acf05a48b01804af9e4fad90054c6cdb7 (diff)
drm/amdgpu: trace VM flags as 64bits
Otherwise the upper bits are lost. Signed-off-by: Christian König <christian.koenig@amd.com> Reviewed-by: Alex Xie <AlexBin.Xie@amd.com> Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu')
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h18
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h
index 8601904e670a..509f7a63d40c 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h
@@ -224,7 +224,7 @@ TRACE_EVENT(amdgpu_vm_bo_map,
224 __field(long, start) 224 __field(long, start)
225 __field(long, last) 225 __field(long, last)
226 __field(u64, offset) 226 __field(u64, offset)
227 __field(u32, flags) 227 __field(u64, flags)
228 ), 228 ),
229 229
230 TP_fast_assign( 230 TP_fast_assign(
@@ -234,7 +234,7 @@ TRACE_EVENT(amdgpu_vm_bo_map,
234 __entry->offset = mapping->offset; 234 __entry->offset = mapping->offset;
235 __entry->flags = mapping->flags; 235 __entry->flags = mapping->flags;
236 ), 236 ),
237 TP_printk("bo=%p, start=%lx, last=%lx, offset=%010llx, flags=%08x", 237 TP_printk("bo=%p, start=%lx, last=%lx, offset=%010llx, flags=%llx",
238 __entry->bo, __entry->start, __entry->last, 238 __entry->bo, __entry->start, __entry->last,
239 __entry->offset, __entry->flags) 239 __entry->offset, __entry->flags)
240); 240);
@@ -248,7 +248,7 @@ TRACE_EVENT(amdgpu_vm_bo_unmap,
248 __field(long, start) 248 __field(long, start)
249 __field(long, last) 249 __field(long, last)
250 __field(u64, offset) 250 __field(u64, offset)
251 __field(u32, flags) 251 __field(u64, flags)
252 ), 252 ),
253 253
254 TP_fast_assign( 254 TP_fast_assign(
@@ -258,7 +258,7 @@ TRACE_EVENT(amdgpu_vm_bo_unmap,
258 __entry->offset = mapping->offset; 258 __entry->offset = mapping->offset;
259 __entry->flags = mapping->flags; 259 __entry->flags = mapping->flags;
260 ), 260 ),
261 TP_printk("bo=%p, start=%lx, last=%lx, offset=%010llx, flags=%08x", 261 TP_printk("bo=%p, start=%lx, last=%lx, offset=%010llx, flags=%llx",
262 __entry->bo, __entry->start, __entry->last, 262 __entry->bo, __entry->start, __entry->last,
263 __entry->offset, __entry->flags) 263 __entry->offset, __entry->flags)
264); 264);
@@ -269,7 +269,7 @@ DECLARE_EVENT_CLASS(amdgpu_vm_mapping,
269 TP_STRUCT__entry( 269 TP_STRUCT__entry(
270 __field(u64, soffset) 270 __field(u64, soffset)
271 __field(u64, eoffset) 271 __field(u64, eoffset)
272 __field(u32, flags) 272 __field(u64, flags)
273 ), 273 ),
274 274
275 TP_fast_assign( 275 TP_fast_assign(
@@ -277,7 +277,7 @@ DECLARE_EVENT_CLASS(amdgpu_vm_mapping,
277 __entry->eoffset = mapping->last + 1; 277 __entry->eoffset = mapping->last + 1;
278 __entry->flags = mapping->flags; 278 __entry->flags = mapping->flags;
279 ), 279 ),
280 TP_printk("soffs=%010llx, eoffs=%010llx, flags=%08x", 280 TP_printk("soffs=%010llx, eoffs=%010llx, flags=%llx",
281 __entry->soffset, __entry->eoffset, __entry->flags) 281 __entry->soffset, __entry->eoffset, __entry->flags)
282); 282);
283 283
@@ -293,14 +293,14 @@ DEFINE_EVENT(amdgpu_vm_mapping, amdgpu_vm_bo_mapping,
293 293
294TRACE_EVENT(amdgpu_vm_set_ptes, 294TRACE_EVENT(amdgpu_vm_set_ptes,
295 TP_PROTO(uint64_t pe, uint64_t addr, unsigned count, 295 TP_PROTO(uint64_t pe, uint64_t addr, unsigned count,
296 uint32_t incr, uint32_t flags), 296 uint32_t incr, uint64_t flags),
297 TP_ARGS(pe, addr, count, incr, flags), 297 TP_ARGS(pe, addr, count, incr, flags),
298 TP_STRUCT__entry( 298 TP_STRUCT__entry(
299 __field(u64, pe) 299 __field(u64, pe)
300 __field(u64, addr) 300 __field(u64, addr)
301 __field(u32, count) 301 __field(u32, count)
302 __field(u32, incr) 302 __field(u32, incr)
303 __field(u32, flags) 303 __field(u64, flags)
304 ), 304 ),
305 305
306 TP_fast_assign( 306 TP_fast_assign(
@@ -310,7 +310,7 @@ TRACE_EVENT(amdgpu_vm_set_ptes,
310 __entry->incr = incr; 310 __entry->incr = incr;
311 __entry->flags = flags; 311 __entry->flags = flags;
312 ), 312 ),
313 TP_printk("pe=%010Lx, addr=%010Lx, incr=%u, flags=%08x, count=%u", 313 TP_printk("pe=%010Lx, addr=%010Lx, incr=%u, flags=%llx, count=%u",
314 __entry->pe, __entry->addr, __entry->incr, 314 __entry->pe, __entry->addr, __entry->incr,
315 __entry->flags, __entry->count) 315 __entry->flags, __entry->count)
316); 316);