drm/xe/pf: Don't force 2MB VRAM alignment

There is no need to always request VRAM BO to have 2MB alignment
as for now this is required by the LMTT only, which could be not
present on some platforms with VRAM.

Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com>
Reviewed-by: Matthew Brost <matthew.brost@intel.com>
Link: https://patch.msgid.link/20260221152230.7071-3-michal.wajdeczko@intel.com

diff --git a/drivers/gpu/drm/xe/xe_gt_sriov_pf_config.c b/drivers/gpu/drm/xe/xe_gt_sriov_pf_config.c
index 6383763d02abf78a961d54a9faccea1e0ef7068a..53f03e7075d2f6d0a2cb927191ccc3e39ab7f7f7 100644 (file)
--- a/drivers/gpu/drm/xe/xe_gt_sriov_pf_config.c
+++ b/drivers/gpu/drm/xe/xe_gt_sriov_pf_config.c
@@ -1626,13 +1626,15 @@ static int pf_provision_vf_lmem(struct xe_gt *gt, unsigned int vfid, u64 size)
        struct xe_device *xe = gt_to_xe(gt);
        struct xe_tile *tile = gt_to_tile(gt);
        struct xe_bo *bo;
+       u64 alignment;
        int err;
 
        xe_gt_assert(gt, vfid);
        xe_gt_assert(gt, IS_DGFX(xe));
        xe_gt_assert(gt, xe_gt_is_main_type(gt));
 
-       size = round_up(size, pf_get_lmem_alignment(gt));
+       alignment = pf_get_lmem_alignment(gt);
+       size = round_up(size, alignment);
 
        if (config->lmem_obj) {
                err = pf_distribute_config_lmem(gt, vfid, 0);
@@ -1648,12 +1650,12 @@ static int pf_provision_vf_lmem(struct xe_gt *gt, unsigned int vfid, u64 size)
        if (!size)
                return 0;
 
-       xe_gt_assert(gt, pf_get_lmem_alignment(gt) == SZ_2M);
+       xe_gt_assert(gt, alignment == XE_PAGE_SIZE || alignment == SZ_2M);
        bo = xe_bo_create_pin_range_novm(xe, tile,
                                         ALIGN(size, PAGE_SIZE), 0, ~0ull,
                                         ttm_bo_type_kernel,
                                         XE_BO_FLAG_VRAM(tile->mem.vram) |
-                                        XE_BO_FLAG_NEEDS_2M |
+                                        (alignment == SZ_2M ? XE_BO_FLAG_NEEDS_2M : 0) |
                                         XE_BO_FLAG_PINNED |
                                         XE_BO_FLAG_PINNED_LATE_RESTORE |
                                         XE_BO_FLAG_FORCE_USER_VRAM);