From: Christian König <christian.koenig@amd.com>
Date: Thu, 21 Dec 2017 12:30:50 +0000 (+0100)
Subject: drm/amdgpu: loosen the criteria for huge pages a bit
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=4d4358f3f1d8fcc90aec89ea2925e748515b4332;p=openwrt%2Fstaging%2Fblogic.git

drm/amdgpu: loosen the criteria for huge pages a bit

We can actually handle invalid huge pages perfectly fine now.

Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Chunming Zhou <david1.zhou@amd.com>
Acked-by: Felix Kuehling <Felix.Kuehling@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
index d4510807a692..3632c69f1814 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
@@ -950,11 +950,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 {