drm/xe/stolen: lower the default alignment
authorMatthew Auld <matthew.auld@intel.com>
Fri, 12 Apr 2024 15:03:02 +0000 (16:03 +0100)
committerMatthew Auld <matthew.auld@intel.com>
Wed, 17 Apr 2024 12:09:46 +0000 (13:09 +0100)
No need to be so aggressive here. The upper layers will already apply
the needed alignment, plus some allocations might wish to skip it. Main
issue is that we might want to have start/end bias range which doesn't
match the default alignment which is rejected by the allocator.

Signed-off-by: Matthew Auld <matthew.auld@intel.com>
Cc: Matt Roper <matthew.d.roper@intel.com>
Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240412150301.273344-3-matthew.auld@intel.com
drivers/gpu/drm/xe/xe_ttm_stolen_mgr.c

index 6ffecf9..f773673 100644 (file)
@@ -204,7 +204,7 @@ void xe_ttm_stolen_mgr_init(struct xe_device *xe)
 {
        struct xe_ttm_stolen_mgr *mgr = drmm_kzalloc(&xe->drm, sizeof(*mgr), GFP_KERNEL);
        struct pci_dev *pdev = to_pci_dev(xe->drm.dev);
-       u64 stolen_size, io_size, pgsize;
+       u64 stolen_size, io_size;
        int err;
 
        if (!mgr) {
@@ -226,10 +226,6 @@ void xe_ttm_stolen_mgr_init(struct xe_device *xe)
                return;
        }
 
-       pgsize = xe->info.vram_flags & XE_VRAM_FLAGS_NEED64K ? SZ_64K : SZ_4K;
-       if (pgsize < PAGE_SIZE)
-               pgsize = PAGE_SIZE;
-
        /*
         * We don't try to attempt partial visible support for stolen vram,
         * since stolen is always at the end of vram, and the BAR size is pretty
@@ -240,7 +236,7 @@ void xe_ttm_stolen_mgr_init(struct xe_device *xe)
                io_size = stolen_size;
 
        err = __xe_ttm_vram_mgr_init(xe, &mgr->base, XE_PL_STOLEN, stolen_size,
-                                    io_size, pgsize);
+                                    io_size, PAGE_SIZE);
        if (err) {
                drm_dbg_kms(&xe->drm, "Stolen mgr init failed: %i\n", err);
                return;