diff options
author | Christian König <christian.koenig@amd.com> | 2017-12-21 07:30:50 -0500 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2018-01-10 15:44:52 -0500 |
commit | 4d4358f3f1d8fcc90aec89ea2925e748515b4332 (patch) | |
tree | 41b4cdc6b966f80a2ab6d78d5b3d231c7a8a5b9e /drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | |
parent | 4dbda35ffaa3eb52ecf960b56220644158ddae12 (diff) |
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>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 7 |
1 files 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 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, | |||
950 | uint64_t pd_addr, pde; | 950 | uint64_t pd_addr, pde; |
951 | 951 | ||
952 | /* In the case of a mixed PT the PDE must point to it*/ | 952 | /* In the case of a mixed PT the PDE must point to it*/ |
953 | if (p->adev->asic_type < CHIP_VEGA10 || | 953 | if (p->adev->asic_type < CHIP_VEGA10 || p->src || |
954 | nptes != AMDGPU_VM_PTE_COUNT(p->adev) || | 954 | nptes != AMDGPU_VM_PTE_COUNT(p->adev)) { |
955 | p->src || | ||
956 | !(flags & AMDGPU_PTE_VALID)) { | ||
957 | |||
958 | dst = amdgpu_bo_gpu_offset(entry->base.bo); | 955 | dst = amdgpu_bo_gpu_offset(entry->base.bo); |
959 | flags = AMDGPU_PTE_VALID; | 956 | flags = AMDGPU_PTE_VALID; |
960 | } else { | 957 | } else { |