From bfc0b9f709b5ef7f922898f77e5b0d5ad51edd86 Mon Sep 17 00:00:00 2001 From: Ben Crocker Date: Mon, 18 Jun 2018 13:31:42 -0400 Subject: [PATCH 1/4] Additional debug messages Signed-off-by: Ben Crocker --- drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c index 311589e02d17..7ef82f226b58 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c @@ -63,6 +63,7 @@ int amdgpu_ib_get(struct amdgpu_device *adev, struct amdgpu_vm *vm, int r; if (size) { + DRM_INFO("amdgpu_ib_get calls amdgpu_sa_bo_new(..., size=%u (%08x), align=%u\n", size, size, 256); r = amdgpu_sa_bo_new(&adev->ring_tmp_bo, &ib->sa_bo, size, 256); if (r) { -- 2.13.6 From bc37343ca75a5603861360c361dc87c025bd3b77 Mon Sep 17 00:00:00 2001 From: Ben Crocker Date: Mon, 18 Jun 2018 13:32:11 -0400 Subject: [PATCH 2/4] Additional debug messages Signed-off-by: Ben Crocker --- drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c index 2bd56760c744..5b32f71fffc8 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c @@ -75,6 +75,7 @@ int amdgpu_job_alloc_with_ib(struct amdgpu_device *adev, unsigned size, if (r) return r; + DRM_INFO("amdgpu_job_alloc_with_ib calls amdgpu_ib_get(..., size=%u (%08x))\n", size); r = amdgpu_ib_get(adev, NULL, size, &(*job)->ibs[0]); if (r) kfree(*job); -- 2.13.6 From c694f2e7feb144b09aeff69e26a6321efc219eba Mon Sep 17 00:00:00 2001 From: Ben Crocker Date: Mon, 18 Jun 2018 13:33:50 -0400 Subject: [PATCH 4/4] Additional debug messages Signed-off-by: Ben Crocker --- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c index da55a78d7380..bece9750ffa9 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c @@ -1290,24 +1290,29 @@ static int amdgpu_vm_bo_update_mapping(struct amdgpu_device *adev, ndw = 64; if (pages_addr) { + DRM_INFO("amdgpu_vm_bo_update_mapping l.%u: ndw=%u ncmds=%u nptes=%u copy_pte_num_dw=%u\n", __LINE__, ndw, ncmds, nptes, adev->vm_manager.vm_pte_funcs->copy_pte_num_dw); /* copy commands needed */ ndw += ncmds * adev->vm_manager.vm_pte_funcs->copy_pte_num_dw; /* and also PTEs */ ndw += nptes * 2; + DRM_INFO("amdgpu_vm_bo_update_mapping l.%u: resulting ndw=%u\n", __LINE__, ndw); params.func = amdgpu_vm_do_copy_ptes; } else { + DRM_INFO("amdgpu_vm_bo_update_mapping l.%u: ndw=%u ncmds=%u fragment_size=%u\n", __LINE__, ndw, ncmds, adev->vm_manager.fragment_size); /* set page commands needed */ ndw += ncmds * 10; /* extra commands for begin/end fragments */ ndw += 2 * 10 * adev->vm_manager.fragment_size; + DRM_INFO("amdgpu_vm_bo_update_mapping l.%u: resulting ndw=%u\n", __LINE__, ndw); params.func = amdgpu_vm_do_set_ptes; } + DRM_INFO("amdgpu_vm_bo_update_mapping calls amdgpu_job_alloc_with_ib(..., ndw*4 = %u (%08X))\n", ndw * 4, ndw * 4); r = amdgpu_job_alloc_with_ib(adev, ndw * 4, &job); if (r) return r; -- 2.13.6