From 1e6ffb20beadf4e959628b294219f01d0639f4e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6nig?= Date: Thu, 31 Aug 2017 09:43:21 +0200 Subject: [PATCH 0884/4131] drm/amdgpu: Revert "Fix IB allocation sizes for page table updates" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The IB allocation sizes where correct. This reverts commit d1551e7c7211fa135c4d79f09e237f5f9779e421. Signed-off-by: Christian König Reviewed-by: Felix Kuehling --- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c index 4ef0c82..0c1cbb9 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c @@ -1042,7 +1042,7 @@ static int amdgpu_vm_update_level(struct amdgpu_device *adev, ndw = 64; /* assume the worst case */ - ndw += parent->last_entry_used * 10; + ndw += parent->last_entry_used * 6; pd_addr = amdgpu_bo_gpu_offset(parent->base.bo); @@ -1545,7 +1545,7 @@ static int amdgpu_vm_bo_update_mapping(struct amdgpu_device *adev, ndw = 64; /* one PDE write for each huge page */ - ndw += ((nptes >> adev->vm_manager.block_size) + 1) * 10; + ndw += ((nptes >> adev->vm_manager.block_size) + 1) * 6; if (pages_addr) { /* copy commands needed */ -- 2.7.4