On Thursday, September 17, 2026 1:01:47 PM Central European Summer Time Huang Yu wrote: > From: Christian König <[email protected]> > > Those can be determined by the parameter structure as well. > > Signed-off-by: Christian König <[email protected]>
Nice cleanup! Reviewed-by: Timur Kristóf <[email protected]> > --- > drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h | 10 +++++----- > drivers/gpu/drm/amd/amdgpu/amdgpu_vm_pt.c | 5 +---- > 2 files changed, 6 insertions(+), 9 deletions(-) > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h > b/drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h index > 784adf975b04..599c1d0e512b 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h > @@ -331,9 +331,8 @@ TRACE_EVENT(amdgpu_vm_update_ptes, > TP_PROTO(struct amdgpu_vm_update_params *p, > uint64_t start, uint64_t end, > unsigned int nptes, uint64_t dst, > - uint64_t incr, uint64_t flags, > - pid_t pid, uint64_t vm_ctx), > - TP_ARGS(p, start, end, nptes, dst, incr, flags, pid, vm_ctx), > + uint64_t incr, uint64_t flags), > + TP_ARGS(p, start, end, nptes, dst, incr, flags), > TP_STRUCT__entry( > __field(u64, start) > __field(u64, end) > @@ -353,8 +352,9 @@ TRACE_EVENT(amdgpu_vm_update_ptes, > __entry->flags = flags; > __entry->incr = incr; > __entry->nptes = nptes; > - __entry->pid = pid; > - __entry->vm_ctx = vm_ctx; > + __entry->pid = p->vm->task_info ? > + p->vm->task_info->tgid : 0; > + __entry->vm_ctx = p->vm- >immediate.fence_context; > for (i = 0; i < nptes; ++i) { > u64 addr = p->pages_addr ? amdgpu_vm_map_gart( > p->pages_addr, dst) : dst; > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm_pt.c > b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm_pt.c index > 0d7fe32d0c7d..b85b70a1a428 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm_pt.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm_pt.c > @@ -882,7 +882,6 @@ int amdgpu_vm_ptes_update(struct amdgpu_vm_update_params > *params, entry_end = min(entry_end, end); > > do { > - struct amdgpu_vm *vm = params->vm; > uint64_t upd_end = min(entry_end, frag_end); > unsigned int nptes = (upd_end - frag_start) >> shift; > uint64_t upd_flags = flags | AMDGPU_PTE_FRAG(frag); > @@ -894,9 +893,7 @@ int amdgpu_vm_ptes_update(struct amdgpu_vm_update_params > *params, > > trace_amdgpu_vm_update_ptes(params, frag_start, upd_end, > min(nptes, 32u), dst, incr, > - upd_flags, > - vm- >task_info ? vm->task_info->tgid : 0, > - vm- >immediate.fence_context); > + upd_flags); > amdgpu_vm_pte_update_flags(params, to_amdgpu_bo_vm(pt), > cursor.level, pe_start, dst, > nptes, incr, upd_flags);
