On Mon, Jun 22, 2015 at 11:47:02AM -0700, Anuj Phogat wrote:
> and use it to initialize the align variable in drm_intel_bo.
>
> 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. 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)
This will hurt badly since some programs love to cycle through textures.
You can still allocate from the cache, you only need to update the
alignement constraint. The kernel will move the buffer on the next execbuf
if it's misplaced.
-Daniel
>
> Signed-off-by: Anuj Phogat <anuj.phogat@xxxxxxxxx>
> Cc: Ben Widawsky <ben@xxxxxxxxxxxx>
> ---
> intel/intel_bufmgr_gem.c | 20 ++++++++++++++------
> 1 file changed, 14 insertions(+), 6 deletions(-)
>
> diff --git a/intel/intel_bufmgr_gem.c b/intel/intel_bufmgr_gem.c
> index 60c06fc..60f494e 100644
> --- a/intel/intel_bufmgr_gem.c
> +++ b/intel/intel_bufmgr_gem.c
> @@ -660,7 +660,8 @@ drm_intel_gem_bo_alloc_internal(drm_intel_bufmgr *bufmgr,
> unsigned long size,
> unsigned long flags,
> 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_bo_gem *bo_gem;
> @@ -700,9 +701,14 @@ retry:
> */
> bo_gem = DRMLISTENTRY(drm_intel_bo_gem,
> bucket->head.prev, head);
> - DRMLISTDEL(&bo_gem->head);
> - alloc_from_cache = true;
> + if (alignment > 0 && bo_gem->bo.align != alignment) {
> + alloc_from_cache = false;
> + } else {
> + alloc_from_cache = true;
> + DRMLISTDEL(&bo_gem->head);
> + }
> } else {
> + assert(alignment == 0);
> /* For non-render-target BOs (where we're probably
> * going to map it first thing in order to fill it
> * with data), check if the last BO in the cache is
> @@ -759,6 +765,7 @@ retry:
> return NULL;
> }
> bo_gem->bo.bufmgr = bufmgr;
> + bo_gem->bo.align = alignment;
>
> bo_gem->tiling_mode = I915_TILING_NONE;
> bo_gem->swizzle_mode = I915_BIT_6_SWIZZLE_NONE;
> @@ -802,7 +809,8 @@ drm_intel_gem_bo_alloc_for_render(drm_intel_bufmgr *bufmgr,
> {
> return drm_intel_gem_bo_alloc_internal(bufmgr, name, size,
> BO_ALLOC_FOR_RENDER,
> - I915_TILING_NONE, 0);
> + I915_TILING_NONE, 0,
> + alignment);
> }
>
> static drm_intel_bo *
> @@ -812,7 +820,7 @@ drm_intel_gem_bo_alloc(drm_intel_bufmgr *bufmgr,
> unsigned int alignment)
> {
> return drm_intel_gem_bo_alloc_internal(bufmgr, name, size, 0,
> - I915_TILING_NONE, 0);
> + I915_TILING_NONE, 0, 0);
> }
>
> static drm_intel_bo *
> @@ -864,7 +872,7 @@ drm_intel_gem_bo_alloc_tiled(drm_intel_bufmgr *bufmgr, const char *name,
> stride = 0;
>
> return drm_intel_gem_bo_alloc_internal(bufmgr, name, size, flags,
> - tiling, stride);
> + tiling, stride, 0);
> }
>
> static drm_intel_bo *
> --
> 1.9.3
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
