drm/amdgpu: revert "add new bo flag that indicates BOs don't need fallback (v2)"
This reverts commit 6f51d28bfe8e1a676de5cd877639245bed3cc818. Makes fallback handling to complicated. This is just a feature for the GEM interface and shouldn't leak into the core BO create function. Signed-off-by: Christian König <christian.koenig@amd.com> Acked-by: Chunming Zhou <david1.zhou@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>hifive-unleashed-5.1
parent
63c2f7ed7b
commit
1afd30efed
|
@ -385,8 +385,7 @@ retry:
|
||||||
amdgpu_bo_in_cpu_visible_vram(bo))
|
amdgpu_bo_in_cpu_visible_vram(bo))
|
||||||
p->bytes_moved_vis += ctx.bytes_moved;
|
p->bytes_moved_vis += ctx.bytes_moved;
|
||||||
|
|
||||||
if (unlikely(r == -ENOMEM) && domain != bo->allowed_domains &&
|
if (unlikely(r == -ENOMEM) && domain != bo->allowed_domains) {
|
||||||
!(bo->flags & AMDGPU_GEM_CREATE_NO_FALLBACK)) {
|
|
||||||
domain = bo->allowed_domains;
|
domain = bo->allowed_domains;
|
||||||
goto retry;
|
goto retry;
|
||||||
}
|
}
|
||||||
|
|
|
@ -388,8 +388,6 @@ retry:
|
||||||
drm_gem_private_object_init(adev->ddev, &bo->gem_base, size);
|
drm_gem_private_object_init(adev->ddev, &bo->gem_base, size);
|
||||||
INIT_LIST_HEAD(&bo->shadow_list);
|
INIT_LIST_HEAD(&bo->shadow_list);
|
||||||
INIT_LIST_HEAD(&bo->va);
|
INIT_LIST_HEAD(&bo->va);
|
||||||
bo->preferred_domains = preferred_domains;
|
|
||||||
bo->allowed_domains = allowed_domains;
|
|
||||||
|
|
||||||
bo->flags = flags;
|
bo->flags = flags;
|
||||||
|
|
||||||
|
@ -426,8 +424,7 @@ retry:
|
||||||
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 && r != -ERESTARTSYS) && type == ttm_bo_type_device &&
|
if (unlikely(r && r != -ERESTARTSYS) && type == ttm_bo_type_device) {
|
||||||
!(flags & AMDGPU_GEM_CREATE_NO_FALLBACK)) {
|
|
||||||
if (flags & AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED) {
|
if (flags & AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED) {
|
||||||
flags &= ~AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED;
|
flags &= ~AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED;
|
||||||
goto retry;
|
goto retry;
|
||||||
|
|
|
@ -95,8 +95,6 @@ extern "C" {
|
||||||
#define AMDGPU_GEM_CREATE_VM_ALWAYS_VALID (1 << 6)
|
#define AMDGPU_GEM_CREATE_VM_ALWAYS_VALID (1 << 6)
|
||||||
/* Flag that BO sharing will be explicitly synchronized */
|
/* Flag that BO sharing will be explicitly synchronized */
|
||||||
#define AMDGPU_GEM_CREATE_EXPLICIT_SYNC (1 << 7)
|
#define AMDGPU_GEM_CREATE_EXPLICIT_SYNC (1 << 7)
|
||||||
/* Flag that BO doesn't need fallback */
|
|
||||||
#define AMDGPU_GEM_CREATE_NO_FALLBACK (1 << 8)
|
|
||||||
|
|
||||||
struct drm_amdgpu_gem_create_in {
|
struct drm_amdgpu_gem_create_in {
|
||||||
/** the requested memory size */
|
/** the requested memory size */
|
||||||
|
|
Loading…
Reference in New Issue