diff options
| author | Marek Olšák <marek.olsak@amd.com> | 2020-11-12 14:09:35 -0500 |
|---|---|---|
| committer | Marek Olšák <marek.olsak@amd.com> | 2020-11-18 23:50:36 -0500 |
| commit | a09bc2db1898488f76cf03fd65bd5d920a21ea1c (patch) | |
| tree | b3e2a82c2d615d319595a24a774ce65ea41d919b /src/gallium/winsys/amdgpu/drm | |
| parent | 31290f98061acc237ba0f5d9c8c4c38ad6075c70 (diff) | |
winsys/amdgpu: remove amdgpu_winsys_bo::u::sparse::flags
Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7585>
Diffstat (limited to 'src/gallium/winsys/amdgpu/drm')
| -rw-r--r-- | src/gallium/winsys/amdgpu/drm/amdgpu_bo.c | 4 | ||||
| -rw-r--r-- | src/gallium/winsys/amdgpu/drm/amdgpu_bo.h | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/gallium/winsys/amdgpu/drm/amdgpu_bo.c b/src/gallium/winsys/amdgpu/drm/amdgpu_bo.c index e8b95dc556b..f9dbf6e2eca 100644 --- a/src/gallium/winsys/amdgpu/drm/amdgpu_bo.c +++ b/src/gallium/winsys/amdgpu/drm/amdgpu_bo.c @@ -892,7 +892,7 @@ sparse_backing_alloc(struct amdgpu_winsys_bo *bo, uint32_t *pstart_page, uint32_ buf = amdgpu_bo_create(bo->ws, size, RADEON_SPARSE_PAGE_SIZE, bo->initial_domain, - bo->u.sparse.flags | RADEON_FLAG_NO_SUBALLOC); + (bo->flags & ~RADEON_FLAG_SPARSE) | RADEON_FLAG_NO_SUBALLOC); if (!buf) { FREE(best_backing->chunks); FREE(best_backing); @@ -1072,7 +1072,7 @@ amdgpu_bo_sparse_create(struct amdgpu_winsys *ws, uint64_t size, bo->initial_domain = domain; bo->unique_id = __sync_fetch_and_add(&ws->next_bo_unique_id, 1); bo->sparse = true; - bo->u.sparse.flags = flags & ~RADEON_FLAG_SPARSE; + bo->flags = flags; bo->u.sparse.num_va_pages = DIV_ROUND_UP(size, RADEON_SPARSE_PAGE_SIZE); bo->u.sparse.commitments = CALLOC(bo->u.sparse.num_va_pages, diff --git a/src/gallium/winsys/amdgpu/drm/amdgpu_bo.h b/src/gallium/winsys/amdgpu/drm/amdgpu_bo.h index 29f7c4032d4..88e01b8f3df 100644 --- a/src/gallium/winsys/amdgpu/drm/amdgpu_bo.h +++ b/src/gallium/winsys/amdgpu/drm/amdgpu_bo.h @@ -75,7 +75,6 @@ struct amdgpu_winsys_bo { } slab; struct { amdgpu_va_handle va_handle; - enum radeon_bo_flag flags; uint32_t num_va_pages; uint32_t num_backing_pages; |