From c1322c93f4e1b4bd1dbf93e0ec543f843aa149f4 Mon Sep 17 00:00:00 2001 From: Ben Crocker Date: Tue, 19 Jun 2018 21:02:22 -0400 Subject: [PATCH 1/2] Additional debug messages Signed-off-by: Ben Crocker --- drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c index 5b32f71fffc8..865326cd82dc 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c @@ -75,7 +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); + DRM_INFO("amdgpu_job_alloc_with_ib calls amdgpu_ib_get(..., size=%u (%08x))\n", size, size); r = amdgpu_ib_get(adev, NULL, size, &(*job)->ibs[0]); if (r) kfree(*job); -- 2.13.6 From c1e9a44dd373e14043254bd3222a86f485b0065b Mon Sep 17 00:00:00 2001 From: Ben Crocker Date: Tue, 19 Jun 2018 21:09:38 -0400 Subject: [PATCH 2/2] Additional debug messages Signed-off-by: Ben Crocker --- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c index bece9750ffa9..04fea8de61a8 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c @@ -1438,6 +1438,8 @@ static int amdgpu_vm_bo_split_mapping(struct amdgpu_device *adev, addr = nodes->start << PAGE_SHIFT; max_entries = (nodes->size - pfn) * (PAGE_SIZE / AMDGPU_GPU_PAGE_SIZE); + DRM_INFO_ONCE("amdgpu_vm_bo_split_mapping: PAGE_SIZE=%lu PAGE_SHIFT=%u\n", PAGE_SIZE, PAGE_SHIFT); + DRM_INFO("amdgpu_vm_bo_split_mapping nodes->size=%llu pfn=%llu max_entries=%llu\n", nodes->size, pfn, max_entries); } else { addr = 0; max_entries = S64_MAX; @@ -1447,6 +1449,7 @@ static int amdgpu_vm_bo_split_mapping(struct amdgpu_device *adev, uint64_t count; max_entries = min(max_entries, 16ull * 1024ull); + DRM_INFO("amdgpu_vm_bo_split_mapping: max_entries=%llu\n", max_entries); for (count = 1; count < max_entries; ++count) { uint64_t idx = pfn + count; @@ -1462,13 +1465,15 @@ static int amdgpu_vm_bo_split_mapping(struct amdgpu_device *adev, addr = pages_addr[pfn]; max_entries = count; } - + DRM_INFO("amdgpu_vm_bo_split_mapping: addr=%#llx count=%llu max_entries=%llu\n", addr, count, max_entries); } else if (flags & AMDGPU_PTE_VALID) { + DRM_INFO("amdgpu_vm_bo_split_mapping: addr=%#llx vram_base_offset=%#llx\n", addr, adev->vm_manager.vram_base_offset); addr += adev->vm_manager.vram_base_offset; addr += pfn << PAGE_SHIFT; } last = min((uint64_t)mapping->last, start + max_entries - 1); + DRM_INFO("amdgpu_vm_bo_split_mapping: start=%#llx last=%#llx\n", start, last); r = amdgpu_vm_bo_update_mapping(adev, exclusive, dma_addr, vm, start, last, flags, addr, fence); -- 2.13.6