From: Christian König Date: Wed, 3 Feb 2016 21:39:01 +0000 (+0100) Subject: drm/amdgpu: fix size estimation for clear IB X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=b6ea2f37a222c9d04725188a9751f21ee07eab2e;p=openwrt%2Fstaging%2Fblogic.git drm/amdgpu: fix size estimation for clear IB We only need a few dw here. Signed-off-by: Christian König Reviewed-by: Alex Deucher Signed-off-by: Alex Deucher --- diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c index eb38aa2bd1c4..f7eee81d120a 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c @@ -355,15 +355,15 @@ static int amdgpu_vm_clear_bo(struct amdgpu_device *adev, if (!ib) goto error; - r = amdgpu_ib_get(ring, NULL, entries * 2 + 64, ib); + r = amdgpu_ib_get(ring, NULL, 64, ib); if (r) goto error_free; ib->length_dw = 0; amdgpu_vm_update_pages(adev, NULL, 0, ib, addr, 0, entries, 0, 0); - amdgpu_vm_pad_ib(adev, ib); + WARN_ON(ib->length_dw > 64); r = amdgpu_sched_ib_submit_kernel_helper(adev, ring, ib, 1, &amdgpu_vm_free_job,