Skip to content

Commit 72c7a7e

Browse files
author
Nirmoy Das
committed
drm/amdgpu: add debug printks for d3ef581
Signed-off-by: Nirmoy Das <nirmoy.das@amd.com>
1 parent 19bafac commit 72c7a7e

File tree

2 files changed

+18
-6
lines changed

2 files changed

+18
-6
lines changed

drivers/gpu/drm/amd/amdgpu/amdgpu_object.c

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1336,8 +1336,10 @@ vm_fault_t amdgpu_bo_fault_reserve_notify(struct ttm_buffer_object *bo)
13361336
return 0;
13371337

13381338
/* Can't move a pinned BO to visible VRAM */
1339-
if (abo->tbo.pin_count > 0)
1339+
if (abo->tbo.pin_count > 0) {
1340+
printk("amdgpu_bo_fault_reserve_notify: pin count > 0\n");
13401341
return VM_FAULT_SIGBUS;
1342+
}
13411343

13421344
/* hurrah the memory is not visible ! */
13431345
atomic64_inc(&adev->num_vram_cpu_page_faults);
@@ -1351,14 +1353,18 @@ vm_fault_t amdgpu_bo_fault_reserve_notify(struct ttm_buffer_object *bo)
13511353
r = ttm_bo_validate(bo, &abo->placement, &ctx);
13521354
if (unlikely(r == -EBUSY || r == -ERESTARTSYS))
13531355
return VM_FAULT_NOPAGE;
1354-
else if (unlikely(r))
1356+
else if (unlikely(r)) {
1357+
printk("amdgpu_bo_fault_reserve_notify: Failed to ttm_bo_validate %d\n", r);
13551358
return VM_FAULT_SIGBUS;
1359+
}
13561360

13571361
offset = bo->mem.start << PAGE_SHIFT;
13581362
/* this should never happen */
13591363
if (bo->mem.mem_type == TTM_PL_VRAM &&
1360-
(offset + size) > adev->gmc.visible_vram_size)
1364+
(offset + size) > adev->gmc.visible_vram_size) {
1365+
printk("amdgpu_bo_fault_reserve_notify: sending SIGBUS offset +size > visible vram\n");
13611366
return VM_FAULT_SIGBUS;
1367+
}
13621368

13631369
ttm_bo_move_to_lru_tail_unlocked(bo);
13641370
return 0;

drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1985,17 +1985,23 @@ static vm_fault_t amdgpu_ttm_fault(struct vm_fault *vmf)
19851985
vm_fault_t ret;
19861986

19871987
ret = ttm_bo_vm_reserve(bo, vmf);
1988-
if (ret)
1988+
if (ret) {
1989+
printk("amdgpu_ttm_fault: ttm_bo_vm_reserve failed with %d\n", ret);
19891990
return ret;
1991+
}
19901992

19911993
ret = amdgpu_bo_fault_reserve_notify(bo);
1992-
if (ret)
1994+
if (ret) {
1995+
printk("amdgpu_ttm_fault: amdgpu_bo_fault_reserve_notify failed with %d\n", ret);
19931996
goto unlock;
1997+
}
19941998

19951999
ret = ttm_bo_vm_fault_reserved(vmf, vmf->vma->vm_page_prot,
19962000
TTM_BO_VM_NUM_PREFAULT, 1);
1997-
if (ret == VM_FAULT_RETRY && !(vmf->flags & FAULT_FLAG_RETRY_NOWAIT))
2001+
if (ret == VM_FAULT_RETRY && !(vmf->flags & FAULT_FLAG_RETRY_NOWAIT)) {
2002+
printk("amdgpu_ttm_fault: ttm_bo_vm_fault_reserved failed with %d\n", ret);
19982003
return ret;
2004+
}
19992005

20002006
unlock:
20012007
dma_resv_unlock(bo->base.resv);

0 commit comments

Comments
 (0)