Annotate the original area of the framebuffer as reserved in the GGTT before creating a new GGTT entry. This allows us to remove the range restrictions of GGTT in xe_bo_create_pin_map_at_novm().
Signed-off-by: Maarten Lankhorst <[email protected]> --- drivers/gpu/drm/xe/display/xe_initial_plane.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/drivers/gpu/drm/xe/display/xe_initial_plane.c b/drivers/gpu/drm/xe/display/xe_initial_plane.c index 0f86b73036d03..8127384fa5bdf 100644 --- a/drivers/gpu/drm/xe/display/xe_initial_plane.c +++ b/drivers/gpu/drm/xe/display/xe_initial_plane.c @@ -46,6 +46,7 @@ initial_plane_bo(struct xe_device *xe, resource_size_t phys_base; u32 base, size, flags; u64 page_size = xe->info.vram_flags & XE_VRAM_FLAGS_NEED64K ? SZ_64K : SZ_4K; + struct xe_ggtt_node *original_ggtt_node; if (plane_config->size == 0) return NULL; @@ -111,8 +112,21 @@ initial_plane_bo(struct xe_device *xe, } } + if (base + size <= xe_ggtt_start(tile0->mem.ggtt)) + original_ggtt_node = NULL; + else if (base < xe_ggtt_start(tile0->mem.ggtt)) + original_ggtt_node = xe_ggtt_insert_node_at(tile0->mem.ggtt, size - xe_ggtt_start(tile0->mem.ggtt), page_size, 0, base + size); + else + original_ggtt_node = xe_ggtt_insert_node_at(tile0->mem.ggtt, size, page_size, base, base + size); + + if (IS_ERR(original_ggtt_node)) + return NULL; + bo = xe_bo_create_pin_map_at_novm(xe, tile0, size, phys_base, ttm_bo_type_kernel, flags, 0, false); + if (original_ggtt_node) + xe_ggtt_node_remove_noclear(original_ggtt_node); + if (IS_ERR(bo)) { drm_dbg_kms(&xe->drm, "Failed to create bo phys_base=%pa size %u with flags %x: %li\n", -- 2.53.0
