Commit 501d9438 authored by Matthew Brost's avatar Matthew Brost
Browse files

drm/xe: Update xe_sa to use xe_managed_bo_create_pin_map 



Preferred way to create kernel BOs is xe_managed_bo_create_pin_map, use
it.

Signed-off-by: default avatarMatthew Brost <matthew.brost@intel.com>
Reviewed-by: default avatarLucas De Marchi <lucas.demarchi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240820172958.1095143-7-matthew.brost@intel.com
parent 6eb2aad4

drivers/gpu/drm/xe/xe_sa.c

+6 −7
Original line number Diff line number Diff line
@@ -25,10 +25,9 @@ static void xe_sa_bo_manager_fini(struct drm_device *drm, void *arg) 


	drm_suballoc_manager_fini(&sa_manager->base);



	if (bo->vmap.is_iomem)

	if (sa_manager->is_iomem)

		kvfree(sa_manager->cpu_ptr);



	xe_bo_unpin_map_no_vm(bo);

	sa_manager->bo = NULL;

}
@@ -47,7 +46,7 @@ struct xe_sa_manager *xe_sa_bo_manager_init(struct xe_tile *tile, u32 size, u32 


	sa_manager->bo = NULL;



	bo = xe_bo_create_pin_map(xe, tile, NULL, size, ttm_bo_type_kernel,

	bo = xe_managed_bo_create_pin_map(xe, tile, size,

					  XE_BO_FLAG_VRAM_IF_DGFX(tile) |

					  XE_BO_FLAG_GGTT |

					  XE_BO_FLAG_GGTT_INVALIDATE);
@@ -57,6 +56,7 @@ struct xe_sa_manager *xe_sa_bo_manager_init(struct xe_tile *tile, u32 size, u32 
		return (struct xe_sa_manager *)bo;

	}

	sa_manager->bo = bo;

	sa_manager->is_iomem = bo->vmap.is_iomem;



	drm_suballoc_manager_init(&sa_manager->base, managed_size, align);

	sa_manager->gpu_addr = xe_bo_ggtt_addr(bo);
@@ -64,7 +64,6 @@ struct xe_sa_manager *xe_sa_bo_manager_init(struct xe_tile *tile, u32 size, u32 
	if (bo->vmap.is_iomem) {

		sa_manager->cpu_ptr = kvzalloc(managed_size, GFP_KERNEL);

		if (!sa_manager->cpu_ptr) {

			xe_bo_unpin_map_no_vm(sa_manager->bo);

			sa_manager->bo = NULL;

			return ERR_PTR(-ENOMEM);

		}

drivers/gpu/drm/xe/xe_sa_types.h

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ struct xe_sa_manager { 
	struct xe_bo *bo;

	u64 gpu_addr;

	void *cpu_ptr;

	bool is_iomem;

};



#endif