[PATCH] winsys/amdgpu: align VA allocations to fragment size

[Marek Olšák]

On Tue, May 23, 2017 at 6:43 PM, Christian König
<deathsimple at vodafone.de> wrote:
> From: Christian König <christian.koenig at amd.com>
>
> BOs larger than the minimum fragment size should have their VA
> alignet to at least the fragment size for optimal performance.
>
> Signed-off-by: Christian König <christian.koenig at amd.com>
> ---
>  src/amd/common/ac_gpu_info.c                  | 1 +
>  src/amd/common/ac_gpu_info.h                  | 1 +
>  src/gallium/winsys/amdgpu/drm/amdgpu_bo.c     | 2 ++
>  src/gallium/winsys/amdgpu/drm/amdgpu_winsys.h | 1 +
>  4 files changed, 5 insertions(+)
>
> diff --git a/src/amd/common/ac_gpu_info.c b/src/amd/common/ac_gpu_info.c
> index cf5d6e1..0b4933e 100644
> --- a/src/amd/common/ac_gpu_info.c
> +++ b/src/amd/common/ac_gpu_info.c
> @@ -281,6 +281,7 @@ bool ac_query_gpu_info(int fd, amdgpu_device_handle dev,
>         memcpy(info->cik_macrotile_mode_array, amdinfo->gb_macro_tile_mode,
>                 sizeof(amdinfo->gb_macro_tile_mode));
>
> +       info->pte_fragment_size = alignment_info.size_local;
>         info->gart_page_size = alignment_info.size_remote;
>
>         if (info->chip_class == SI)
> diff --git a/src/amd/common/ac_gpu_info.h b/src/amd/common/ac_gpu_info.h
> index d8029ef..3785eb4 100644
> --- a/src/amd/common/ac_gpu_info.h
> +++ b/src/amd/common/ac_gpu_info.h
> @@ -45,6 +45,7 @@ struct radeon_info {
>         uint32_t                    pci_id;
>         enum radeon_family          family;
>         enum chip_class             chip_class;
> +       uint32_t                    pte_fragment_size;
>         uint32_t                    gart_page_size;
>         uint64_t                    gart_size;
>         uint64_t                    vram_size;
> diff --git a/src/gallium/winsys/amdgpu/drm/amdgpu_bo.c b/src/gallium/winsys/amdgpu/drm/amdgpu_bo.c
> index 6bdcce5..4017411 100644
> --- a/src/gallium/winsys/amdgpu/drm/amdgpu_bo.c
> +++ b/src/gallium/winsys/amdgpu/drm/amdgpu_bo.c
> @@ -415,6 +415,8 @@ static struct amdgpu_winsys_bo *amdgpu_create_bo(struct amdgpu_winsys *ws,
>     }
>
>     va_gap_size = ws->check_vm ? MAX2(4 * alignment, 64 * 1024) : 0;
> +   if (size > ws->info.pte_fragment_size)
> +          alignment = MAX2(alignment, ws->info.pte_fragment_size);
>     r = amdgpu_va_range_alloc(ws->dev, amdgpu_gpu_va_range_general,
>                               size + va_gap_size, alignment, 0, &va, &va_handle, 0);
>     if (r)
> diff --git a/src/gallium/winsys/amdgpu/drm/amdgpu_winsys.h b/src/gallium/winsys/amdgpu/drm/amdgpu_winsys.h
> index 896a463..88975e2 100644
> --- a/src/gallium/winsys/amdgpu/drm/amdgpu_winsys.h
> +++ b/src/gallium/winsys/amdgpu/drm/amdgpu_winsys.h
> @@ -73,6 +73,7 @@ struct amdgpu_winsys {
>
>     struct amdgpu_gpu_info amdinfo;
>     ADDR_HANDLE addrlib;
> +   struct amdgpu_buffer_size_alignments        alignments;
>
>     bool check_vm;

This hunk seems unnecessary. If you remove it, the patch is:

Reviewed-by: Marek Olšák <marek.olsak at amd.com>

Marek