drm/xe/sa: Allow creating suballocator with custom guard size

Actual xe_sa_manager implementation uses hardcoded 4K to exclude
it from making suballocations but in upcoming patch we want to
reuse the xe_sa_manager where such 4K guard is not needed. Add
another variant of the xe_sa_bo_manager_init() function that
accepts arbitrary guard size.

Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com>
Cc: Matthew Brost <matthew.brost@intel.com>
Reviewed-by: Matthew Brost <matthew.brost@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20241220194205.995-7-michal.wajdeczko@intel.com
This commit is contained in:
Michal Wajdeczko 2024-12-20 20:41:59 +01:00
parent 0e1871f61e
commit ae8b507fb8
2 changed files with 23 additions and 4 deletions

View File

@ -31,14 +31,28 @@ static void xe_sa_bo_manager_fini(struct drm_device *drm, void *arg)
sa_manager->bo = NULL;
}
struct xe_sa_manager *xe_sa_bo_manager_init(struct xe_tile *tile, u32 size, u32 align)
/**
* __xe_sa_bo_manager_init() - Create and initialize the suballocator
* @tile: the &xe_tile where allocate
* @size: number of bytes to allocate
* @guard: number of bytes to exclude from suballocations
* @align: alignment for each suballocated chunk
*
* Prepares the suballocation manager for suballocations.
*
* Return: a pointer to the &xe_sa_manager or an ERR_PTR on failure.
*/
struct xe_sa_manager *__xe_sa_bo_manager_init(struct xe_tile *tile, u32 size, u32 guard, u32 align)
{
struct xe_device *xe = tile_to_xe(tile);
struct xe_sa_manager *sa_manager;
u32 managed_size = size - SZ_4K;
u32 managed_size;
struct xe_bo *bo;
int ret;
xe_tile_assert(tile, size > guard);
managed_size = size - guard;
sa_manager = drmm_kzalloc(&xe->drm, sizeof(*sa_manager), GFP_KERNEL);
if (!sa_manager)
return ERR_PTR(-ENOMEM);

View File

@ -5,6 +5,7 @@
#ifndef _XE_SA_H_
#define _XE_SA_H_
#include <linux/sizes.h>
#include <linux/types.h>
#include "xe_sa_types.h"
@ -12,10 +13,14 @@ struct dma_fence;
struct xe_bo;
struct xe_tile;
struct xe_sa_manager *xe_sa_bo_manager_init(struct xe_tile *tile, u32 size, u32 align);
struct xe_sa_manager *__xe_sa_bo_manager_init(struct xe_tile *tile, u32 size, u32 guard, u32 align);
struct drm_suballoc *__xe_sa_bo_new(struct xe_sa_manager *sa_manager, u32 size, gfp_t gfp);
static inline struct xe_sa_manager *xe_sa_bo_manager_init(struct xe_tile *tile, u32 size, u32 align)
{
return __xe_sa_bo_manager_init(tile, size, SZ_4K, align);
}
/**
* xe_sa_bo_new() - Make a suballocation.
* @sa_manager: the &xe_sa_manager