From: "Tianci.Yin" <[email protected]> [why] When GTT domain size is smaller than VRAM, if APP apply a very large buffer whose size is larger than GTT but smaller than VRAM, the size validation will fail.
[how] Validate VRAM domain size at first place, then GTT domain. Change-Id: Ic1d31b9b0a4939e6bba0241ff79ae9aa2225ee05 Signed-off-by: Tianci.Yin <[email protected]> --- drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c index 84745f9e7408..bab134b6369f 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c @@ -464,21 +464,21 @@ static bool amdgpu_bo_validate_size(struct amdgpu_device *adev, { struct ttm_mem_type_manager *man = NULL; - /* - * If GTT is part of requested domains the check must succeed to - * allow fall back to GTT - */ - if (domain & AMDGPU_GEM_DOMAIN_GTT) { - man = &adev->mman.bdev.man[TTM_PL_TT]; + if (domain & AMDGPU_GEM_DOMAIN_VRAM) { + man = &adev->mman.bdev.man[TTM_PL_VRAM]; if (size < (man->size << PAGE_SHIFT)) return true; - else + else if (!(domain & AMDGPU_GEM_DOMAIN_GTT)) goto fail; } - if (domain & AMDGPU_GEM_DOMAIN_VRAM) { - man = &adev->mman.bdev.man[TTM_PL_VRAM]; + /* + * If GTT is part of requested domains the check must succeed to + * allow fall back to GTT + */ + if (domain & AMDGPU_GEM_DOMAIN_GTT) { + man = &adev->mman.bdev.man[TTM_PL_TT]; if (size < (man->size << PAGE_SHIFT)) return true; -- 2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
