Those can be determined by the parameter structure as well.
Signed-off-by: Christian König <[email protected]>
---
drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h | 10 +++++-----
drivers/gpu/drm/amd/amdgpu/amdgpu_vm_pt.c | 11 ++---------
2 files changed, 7 insertions(+), 14 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h
b/drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h
index d6def9bec72c..4580ab533ca9 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h
@@ -325,9 +325,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)
@@ -347,8 +346,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 f9c93a71e153..6026d6f27842 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm_pt.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm_pt.c
@@ -783,8 +783,6 @@ int amdgpu_vm_ptes_update(struct amdgpu_vm_update_params
*params,
uint64_t dst, uint64_t flags)
{
struct amdgpu_device *adev = params->adev;
- struct amdgpu_vm *vm = params->vm;
- pid_t tgid = vm->task_info ? vm->task_info->tgid : 0;
struct amdgpu_vm_pt_cursor cursor;
uint64_t frag_start = start, frag_end;
unsigned int frag;
@@ -873,8 +871,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, tgid,
-
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);
@@ -937,8 +934,6 @@ void amdgpu_vm_update_leaves(struct amdgpu_vm_update_params
*params,
int64_t dst, uint64_t flags)
{
struct amdgpu_device *adev = params->adev;
- struct amdgpu_vm *vm = params->vm;
- pid_t tgid = vm->task_info ? vm->task_info->tgid : 0;
struct amdgpu_vm_pt_cursor cursor;
amdgpu_vm_pt_start(adev, params->vm, start, &cursor);
@@ -971,9 +966,7 @@ void amdgpu_vm_update_leaves(struct amdgpu_vm_update_params
*params,
nptes = max(nptes, 1u);
trace_amdgpu_vm_update_ptes(params, cursor.pfn, entry_end,
- min(nptes, 32u), dst, 0, flags,
- tgid,
- vm->immediate.fence_context);
+ min(nptes, 32u), dst, 0, flags);
amdgpu_vm_pte_update_flags(params, to_amdgpu_bo_vm(pt),
cursor.level - 1, pe_start, dst,
nptes, 0, flags);
--
2.43.0
