drm/amdgpu: Don't change preferred domian when fallback GTT v5
Subsystems (2)
PATCH 1/1 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
Change-Id I2cf672ad36b8b4cc1a6b2e704f786bf6a155d9ce
Signed-off-by Chunming Zhou <[email protected]>
--- drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 16 ++-------------- drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 18 +++++++++++++++--- 2 files changed, 17 insertions(+), 17 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c +2 -14
@@ -76,23 +76,11 @@ int amdgpu_gem_object_create(struct amdgpu_device *adev, unsigned long size, } } -retry: r =amdgpu_bo_create (adev, size, alignment, kernel, initial_domain, flags,NULL , resv, &bo);if (r) { -if (r != -ERESTARTSYS ) { -if (flags &AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED ) { - 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); - } +DRM_DEBUG ("Failed to allocate GEM object (%ld, %d, %u, %d)\n" , + size, initial_domain, alignment, r);return r; } *obj = &bo->gem_base;
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +15 -3
@@ -371,6 +371,7 @@ static int amdgpu_bo_do_create(struct amdgpu_device *adev,enum ttm_bo_type type;unsigned long page_align;size_t acc_size; +u32 domains;int r; page_align =roundup (byte_align,PAGE_SIZE ) >>PAGE_SHIFT ;
@@ -440,12 +441,23 @@ static int amdgpu_bo_do_create(struct amdgpu_device *adev,#endif 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, &bo->placement, page_align, &ctx, acc_size, sg, 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; if (adev->gmc.visible_vram_size < adev->gmc.real_vram_size &&
Signature · 6 lines
2.14.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): [email protected]
Christian König
Reviewed-byAm 21.03.2018 um 11:27 schrieb Chunming Zhou:
Quoted 7 lines
v2: add sanity checking
v3: make code open
v4: also handle visible to invisible fallback
v5: Since two fallback cases, re-use goto retryChange-Id I2cf672ad36b8b4cc1a6b2e704f786bf6a155d9ceSigned-off-by Chunming Zhou <[email protected]>
Reviewed-by Christian König <[email protected]>
Quoted 64 lines
--- drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 16 ++-------------- drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 18 +++++++++++++++--- 2 files changed, 17 insertions(+), 17 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c +2
-14@@ -76,23 +76,11 @@ int amdgpu_gem_object_create(struct amdgpu_device *adev, unsigned long size, } } -retry: r =amdgpu_bo_create (adev, size, alignment, kernel, initial_domain, flags,NULL , resv, &bo);if (r) { -if (r != -ERESTARTSYS ) { -if (flags &AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED ) { - 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); - } +DRM_DEBUG ("Failed to allocate GEM object (%ld, %d, %u, %d)\n" , + size, initial_domain, alignment, r);return r; } *obj = &bo->gem_base;drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +8
-3@@ -371,6 +371,7 @@ static int amdgpu_bo_do_create(struct amdgpu_device *adev,enum ttm_bo_type type;unsigned long page_align;size_t acc_size; +u32 domains;int r; page_align =roundup (byte_align,PAGE_SIZE ) >>PAGE_SHIFT ;@@ -440,12 +441,23 @@ static int amdgpu_bo_do_create(struct amdgpu_device *adev,#endif 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, &bo->placement, page_align, &ctx, acc_size, sg, 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 ;
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c static int amdgpu_bo_do_create(struct amdgpu_device *adev, · line 463
Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +7
-0+ goto retry; + }else if (domains != bo->preferred_domains) { + domains = bo->allowed_domains; + goto retry; + } + } +if (unlikely (r))return r; if (adev->gmc.visible_vram_size < adev->gmc.real_vram_size &&
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx