fdo-mirrors/mesa-drm
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/drm.git synced 2025-12-20 07:00:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

i965/gen9: Pass alignment as function parameter in drm_intel_gem_bo_alloc_internal()

Browse source 
In case of YF/YS tiled buffers libdrm need not know about the tiling
format because these buffers don't have hardware support to be tiled
or detiled through a fenced region. But, libdrm still need to know
about buffer alignment restrictions because kernel uses it when
resolving the relocation.

Mesa uses drm_intel_gem_bo_alloc_for_render() to allocate Yf/Ys buffers.
So, use the passed alignment value in this function to initialize the
align variable in drm_intel_bo. Note that we continue ignoring the
alignment value passed to drm_intel_gem_bo_alloc() to follow the
previous behavior.

V2: Add a condition to avoid allocation from cache. (Ben)
V3: Make no changes in cache allocation strategy. Just update the alignment.
    Update the aperture size estimate including the alignment. (Ben, Chris)
V4: Move aperture size adjustments inside drm_intel_bo_gem_set_in_aperture_size()
    Don't split sentences across the one-line header and the changelog. (Chris)

Signed-off-by: Anuj Phogat <anuj.phogat@gmail.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Anuj Phogat 2015-04-10 17:20:55 -07:00
parent 676c806d02
commit 5c68f9f6f9
1 changed files with 21 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
intel/intel_bufmgr_gem.c
View file

@ -82,6 +82,7 @@
} while (0) } while (0)
#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
#define MAX2(A, B) ((A) > (B) ? (A) : (B))
typedef struct _drm_intel_bo_gem drm_intel_bo_gem; typedef struct _drm_intel_bo_gem drm_intel_bo_gem;
@ -524,9 +525,10 @@ drm_intel_add_validate_buffer2(drm_intel_bo *bo, int need_fence)
static void static void
drm_intel_bo_gem_set_in_aperture_size(drm_intel_bufmgr_gem *bufmgr_gem, drm_intel_bo_gem_set_in_aperture_size(drm_intel_bufmgr_gem *bufmgr_gem,
drm_intel_bo_gem *bo_gem) drm_intel_bo_gem *bo_gem,
unsigned int alignment)
{ {
int size; unsigned int size;
assert(!bo_gem->used_as_reloc_target); assert(!bo_gem->used_as_reloc_target);
@ -538,7 +540,7 @@ drm_intel_bo_gem_set_in_aperture_size(drm_intel_bufmgr_gem *bufmgr_gem,
*/ */
size = bo_gem->bo.size; size = bo_gem->bo.size;
if (bufmgr_gem->gen < 4 && bo_gem->tiling_mode != I915_TILING_NONE) { if (bufmgr_gem->gen < 4 && bo_gem->tiling_mode != I915_TILING_NONE) {
int min_size; unsigned int min_size;
if (bufmgr_gem->has_relaxed_fencing) { if (bufmgr_gem->has_relaxed_fencing) {
if (bufmgr_gem->gen == 3) if (bufmgr_gem->gen == 3)
@ -552,10 +554,10 @@ drm_intel_bo_gem_set_in_aperture_size(drm_intel_bufmgr_gem *bufmgr_gem,
min_size = size; min_size = size;
/* Account for worst-case alignment. */ /* Account for worst-case alignment. */
size = 2 * min_size; alignment = MAX2(alignment, min_size);
} }
bo_gem->reloc_tree_size = size; bo_gem->reloc_tree_size = size + alignment;
} }
static int static int
@ -660,7 +662,8 @@ drm_intel_gem_bo_alloc_internal(drm_intel_bufmgr *bufmgr,
unsigned long size, unsigned long size,
unsigned long flags, unsigned long flags,
uint32_t tiling_mode, uint32_t tiling_mode,
unsigned long stride) unsigned long stride,
unsigned int alignment)
{ {
drm_intel_bufmgr_gem *bufmgr_gem = (drm_intel_bufmgr_gem *) bufmgr; drm_intel_bufmgr_gem *bufmgr_gem = (drm_intel_bufmgr_gem *) bufmgr;
drm_intel_bo_gem *bo_gem; drm_intel_bo_gem *bo_gem;
@ -702,7 +705,9 @@ retry:
bucket->head.prev, head); bucket->head.prev, head);
DRMLISTDEL(&bo_gem->head); DRMLISTDEL(&bo_gem->head);
alloc_from_cache = true; alloc_from_cache = true;
bo_gem->bo.align = alignment;
} else { } else {
assert(alignment == 0);
/* For non-render-target BOs (where we're probably /* For non-render-target BOs (where we're probably
* going to map it first thing in order to fill it * going to map it first thing in order to fill it
* with data), check if the last BO in the cache is * with data), check if the last BO in the cache is
@ -759,6 +764,7 @@ retry:
return NULL; return NULL;
} }
bo_gem->bo.bufmgr = bufmgr; bo_gem->bo.bufmgr = bufmgr;
bo_gem->bo.align = alignment;
bo_gem->tiling_mode = I915_TILING_NONE; bo_gem->tiling_mode = I915_TILING_NONE;
bo_gem->swizzle_mode = I915_BIT_6_SWIZZLE_NONE; bo_gem->swizzle_mode = I915_BIT_6_SWIZZLE_NONE;
@ -786,7 +792,7 @@ retry:
bo_gem->aub_annotations = NULL; bo_gem->aub_annotations = NULL;
bo_gem->aub_annotation_count = 0; bo_gem->aub_annotation_count = 0;
drm_intel_bo_gem_set_in_aperture_size(bufmgr_gem, bo_gem); drm_intel_bo_gem_set_in_aperture_size(bufmgr_gem, bo_gem, alignment);
DBG("bo_create: buf %d (%s) %ldb\n", DBG("bo_create: buf %d (%s) %ldb\n",
bo_gem->gem_handle, bo_gem->name, size); bo_gem->gem_handle, bo_gem->name, size);
@ -802,7 +808,8 @@ drm_intel_gem_bo_alloc_for_render(drm_intel_bufmgr *bufmgr,
{ {
return drm_intel_gem_bo_alloc_internal(bufmgr, name, size, return drm_intel_gem_bo_alloc_internal(bufmgr, name, size,
BO_ALLOC_FOR_RENDER, BO_ALLOC_FOR_RENDER,
I915_TILING_NONE, 0); I915_TILING_NONE, 0,
alignment);
} }
static drm_intel_bo * static drm_intel_bo *
@ -812,7 +819,7 @@ drm_intel_gem_bo_alloc(drm_intel_bufmgr *bufmgr,
unsigned int alignment) unsigned int alignment)
{ {
return drm_intel_gem_bo_alloc_internal(bufmgr, name, size, 0, return drm_intel_gem_bo_alloc_internal(bufmgr, name, size, 0,
I915_TILING_NONE, 0); I915_TILING_NONE, 0, 0);
} }
static drm_intel_bo * static drm_intel_bo *
@ -864,7 +871,7 @@ drm_intel_gem_bo_alloc_tiled(drm_intel_bufmgr *bufmgr, const char *name,
stride = 0; stride = 0;
return drm_intel_gem_bo_alloc_internal(bufmgr, name, size, flags, return drm_intel_gem_bo_alloc_internal(bufmgr, name, size, flags,
tiling, stride); tiling, stride, 0);
} }
static drm_intel_bo * static drm_intel_bo *
@ -931,7 +938,7 @@ drm_intel_gem_bo_alloc_userptr(drm_intel_bufmgr *bufmgr,
bo_gem->has_error = false; bo_gem->has_error = false;
bo_gem->reusable = false; bo_gem->reusable = false;
drm_intel_bo_gem_set_in_aperture_size(bufmgr_gem, bo_gem); drm_intel_bo_gem_set_in_aperture_size(bufmgr_gem, bo_gem, 0);
DBG("bo_create_userptr: " DBG("bo_create_userptr: "
"ptr %p buf %d (%s) size %ldb, stride 0x%x, tile mode %d\n", "ptr %p buf %d (%s) size %ldb, stride 0x%x, tile mode %d\n",
@ -1099,7 +1106,7 @@ drm_intel_bo_gem_create_from_name(drm_intel_bufmgr *bufmgr,
bo_gem->tiling_mode = get_tiling.tiling_mode; bo_gem->tiling_mode = get_tiling.tiling_mode;
bo_gem->swizzle_mode = get_tiling.swizzle_mode; bo_gem->swizzle_mode = get_tiling.swizzle_mode;
/* XXX stride is unknown */ /* XXX stride is unknown */
drm_intel_bo_gem_set_in_aperture_size(bufmgr_gem, bo_gem); drm_intel_bo_gem_set_in_aperture_size(bufmgr_gem, bo_gem, 0);
DRMINITLISTHEAD(&bo_gem->vma_list); DRMINITLISTHEAD(&bo_gem->vma_list);
DRMLISTADDTAIL(&bo_gem->name_list, &bufmgr_gem->named); DRMLISTADDTAIL(&bo_gem->name_list, &bufmgr_gem->named);
@ -2694,7 +2701,7 @@ drm_intel_gem_bo_set_tiling(drm_intel_bo *bo, uint32_t * tiling_mode,
ret = drm_intel_gem_bo_set_tiling_internal(bo, *tiling_mode, stride); ret = drm_intel_gem_bo_set_tiling_internal(bo, *tiling_mode, stride);
if (ret == 0) if (ret == 0)
drm_intel_bo_gem_set_in_aperture_size(bufmgr_gem, bo_gem); drm_intel_bo_gem_set_in_aperture_size(bufmgr_gem, bo_gem, 0);
*tiling_mode = bo_gem->tiling_mode; *tiling_mode = bo_gem->tiling_mode;
return ret; return ret;
@ -2792,7 +2799,7 @@ drm_intel_bo_gem_create_from_prime(drm_intel_bufmgr *bufmgr, int prime_fd, int s
bo_gem->tiling_mode = get_tiling.tiling_mode; bo_gem->tiling_mode = get_tiling.tiling_mode;
bo_gem->swizzle_mode = get_tiling.swizzle_mode; bo_gem->swizzle_mode = get_tiling.swizzle_mode;
/* XXX stride is unknown */ /* XXX stride is unknown */
drm_intel_bo_gem_set_in_aperture_size(bufmgr_gem, bo_gem); drm_intel_bo_gem_set_in_aperture_size(bufmgr_gem, bo_gem, 0);
return &bo_gem->bo; return &bo_gem->bo;
} }