Commit 38453f82 authored by Matthew Auld's avatar Matthew Auld Committed by Rodrigo Vivi

drm/xe/bo: further limit where CCS pages are needed

No need to allocate extra pages for this if we know flat-ccs AUX state
is not even possible, like for normal system memory objects.
Signed-off-by: default avatarMatthew Auld <matthew.auld@intel.com>
Cc: Thomas Hellström <thomas.hellstrom@linux.intel.com>
Reviewed-by: default avatarNirmoy Das <nirmoy.das@intel.com>
Signed-off-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
parent 3690a01b
...@@ -285,6 +285,7 @@ static struct ttm_tt *xe_ttm_tt_create(struct ttm_buffer_object *ttm_bo, ...@@ -285,6 +285,7 @@ static struct ttm_tt *xe_ttm_tt_create(struct ttm_buffer_object *ttm_bo,
struct xe_bo *bo = ttm_to_xe_bo(ttm_bo); struct xe_bo *bo = ttm_to_xe_bo(ttm_bo);
struct xe_device *xe = xe_bo_device(bo); struct xe_device *xe = xe_bo_device(bo);
struct xe_ttm_tt *tt; struct xe_ttm_tt *tt;
unsigned long extra_pages;
int err; int err;
tt = kzalloc(sizeof(*tt), GFP_KERNEL); tt = kzalloc(sizeof(*tt), GFP_KERNEL);
...@@ -293,12 +294,15 @@ static struct ttm_tt *xe_ttm_tt_create(struct ttm_buffer_object *ttm_bo, ...@@ -293,12 +294,15 @@ static struct ttm_tt *xe_ttm_tt_create(struct ttm_buffer_object *ttm_bo,
tt->dev = xe->drm.dev; tt->dev = xe->drm.dev;
extra_pages = 0;
if (xe_bo_needs_ccs_pages(bo))
extra_pages = DIV_ROUND_UP(xe_device_ccs_bytes(xe, bo->size),
PAGE_SIZE);
/* TODO: Select caching mode */ /* TODO: Select caching mode */
err = ttm_tt_init(&tt->ttm, &bo->ttm, page_flags, err = ttm_tt_init(&tt->ttm, &bo->ttm, page_flags,
bo->flags & XE_BO_SCANOUT_BIT ? ttm_write_combined : ttm_cached, bo->flags & XE_BO_SCANOUT_BIT ? ttm_write_combined : ttm_cached,
DIV_ROUND_UP(xe_device_ccs_bytes(xe_bo_device(bo), extra_pages);
bo->ttm.base.size),
PAGE_SIZE));
if (err) { if (err) {
kfree(tt); kfree(tt);
return NULL; return NULL;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment