UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm/amdgpu: Don't change preferred domian when fallback GTT v5 

v2: add sanity checking
v3: make code open
v4: also handle visible to invisible fallback
v5: Since two fallback cases, re-use goto retry

Signed-off-by: Chunming Zhou <david1.zhou@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Chunming Zhou 2018-03-16 12:29:38 +08:00 committed by Alex Deucher
parent b6356df3eb
commit cc15dfaa85
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
View File

@ -56,23 +56,11 @@ int amdgpu_gem_object_create(struct amdgpu_device *adev, unsigned long size,
alignment = PAGE_SIZE; alignment = PAGE_SIZE;
} }
retry:
r = amdgpu_bo_create(adev, size, alignment, initial_domain, r = amdgpu_bo_create(adev, size, alignment, initial_domain,
flags, type, resv, &bo); flags, type, resv, &bo);
if (r) { if (r) {
if (r != -ERESTARTSYS) { DRM_DEBUG("Failed to allocate GEM object (%ld, %d, %u, %d)\n",
if (flags & AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED) { size, initial_domain, alignment, r);
flags &= ~AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED;
goto retry;
}
if (initial_domain == AMDGPU_GEM_DOMAIN_VRAM) {
initial_domain |= AMDGPU_GEM_DOMAIN_GTT;
goto retry;
}
DRM_DEBUG("Failed to allocate GEM object (%ld, %d, %u, %d)\n",
size, initial_domain, alignment, r);
}
return r; return r;
} }
*obj = &bo->gem_base; *obj = &bo->gem_base;

18
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
View File

@ -356,6 +356,7 @@ static int amdgpu_bo_do_create(struct amdgpu_device *adev, unsigned long size,
struct amdgpu_bo *bo; struct amdgpu_bo *bo;
unsigned long page_align; unsigned long page_align;
size_t acc_size; size_t acc_size;
u32 domains;
int r; int r;
page_align = roundup(byte_align, PAGE_SIZE) >> PAGE_SHIFT; page_align = roundup(byte_align, PAGE_SIZE) >> PAGE_SHIFT;
@ -417,12 +418,23 @@ static int amdgpu_bo_do_create(struct amdgpu_device *adev, unsigned long size,
#endif #endif
bo->tbo.bdev = &adev->mman.bdev; bo->tbo.bdev = &adev->mman.bdev;
amdgpu_ttm_placement_from_domain(bo, domain); domains = bo->preferred_domains;
retry:
amdgpu_ttm_placement_from_domain(bo, domains);
r = ttm_bo_init_reserved(&adev->mman.bdev, &bo->tbo, size, type, r = ttm_bo_init_reserved(&adev->mman.bdev, &bo->tbo, size, type,
&bo->placement, page_align, &ctx, acc_size, &bo->placement, page_align, &ctx, acc_size,
NULL, resv, &amdgpu_ttm_bo_destroy); NULL, resv, &amdgpu_ttm_bo_destroy);
if (unlikely(r != 0))
if (unlikely(r && r != -ERESTARTSYS)) {
if (bo->flags & AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED) {
bo->flags &= ~AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED;
goto retry;
} else if (domains != bo->preferred_domains) {
domains = bo->allowed_domains;
goto retry;
}
}
if (unlikely(r))
return r; return r;
if (adev->gmc.visible_vram_size < adev->gmc.real_vram_size && if (adev->gmc.visible_vram_size < adev->gmc.real_vram_size &&