From 856d29ef6a3fac445613857dc5f9d415437bbcbd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6nig?= Date: Thu, 21 Dec 2017 13:30:50 +0100 Subject: [PATCH 3061/4131] drm/amdgpu: loosen the criteria for huge pages a bit MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We can actually handle invalid huge pages perfectly fine now. Signed-off-by: Christian König Reviewed-by: Chunming Zhou Acked-by: Felix Kuehling --- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c index 7b6eb28..cccfbc9 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c @@ -955,11 +955,8 @@ static void amdgpu_vm_handle_huge_pages(struct amdgpu_pte_update_params *p, uint64_t pd_addr, pde; /* In the case of a mixed PT the PDE must point to it*/ - if (p->adev->asic_type < CHIP_VEGA10 || - nptes != AMDGPU_VM_PTE_COUNT(p->adev) || - p->src || - !(flags & AMDGPU_PTE_VALID)) { - + if (p->adev->asic_type < CHIP_VEGA10 || p->src || + nptes != AMDGPU_VM_PTE_COUNT(p->adev)) { dst = amdgpu_bo_gpu_offset(entry->base.bo); flags = AMDGPU_PTE_VALID; } else { -- 2.7.4