diff options
author | Christian König <christian.koenig@amd.com> | 2018-04-10 07:42:29 -0400 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2018-05-15 14:43:19 -0400 |
commit | 1afd30efeddbb1b32cf35d3bf6477b35690eeca6 (patch) | |
tree | b3cc4263897e3726e856093ab9e3b1abc330dc2c /drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | |
parent | 63c2f7ed7bb3e98b4b22d5b136f4749706f17d36 (diff) |
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>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_object.c')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c index a160ef0332d6..1de6864da717 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | |||
@@ -388,8 +388,6 @@ retry: | |||
388 | drm_gem_private_object_init(adev->ddev, &bo->gem_base, size); | 388 | drm_gem_private_object_init(adev->ddev, &bo->gem_base, size); |
389 | INIT_LIST_HEAD(&bo->shadow_list); | 389 | INIT_LIST_HEAD(&bo->shadow_list); |
390 | INIT_LIST_HEAD(&bo->va); | 390 | INIT_LIST_HEAD(&bo->va); |
391 | bo->preferred_domains = preferred_domains; | ||
392 | bo->allowed_domains = allowed_domains; | ||
393 | 391 | ||
394 | bo->flags = flags; | 392 | bo->flags = flags; |
395 | 393 | ||
@@ -426,8 +424,7 @@ retry: | |||
426 | r = ttm_bo_init_reserved(&adev->mman.bdev, &bo->tbo, size, type, | 424 | r = ttm_bo_init_reserved(&adev->mman.bdev, &bo->tbo, size, type, |
427 | &bo->placement, page_align, &ctx, acc_size, | 425 | &bo->placement, page_align, &ctx, acc_size, |
428 | NULL, resv, &amdgpu_ttm_bo_destroy); | 426 | NULL, resv, &amdgpu_ttm_bo_destroy); |
429 | if (unlikely(r && r != -ERESTARTSYS) && type == ttm_bo_type_device && | 427 | if (unlikely(r && r != -ERESTARTSYS) && type == ttm_bo_type_device) { |
430 | !(flags & AMDGPU_GEM_CREATE_NO_FALLBACK)) { | ||
431 | if (flags & AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED) { | 428 | if (flags & AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED) { |
432 | flags &= ~AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED; | 429 | flags &= ~AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED; |
433 | goto retry; | 430 | goto retry; |