Use xe_map_resource_to_region helper instead of direct access

Renaming:
The helper function res_to_mem_region is now xe_map_resource_to_region.

Abstraction:
The patch removes instances where block->private was accessed directly
to obtain VRAM region data allowing VRAM manager to own block->private
for future use cases.

V2(MattB): Add more detail about patch also adjust variable placement

Reviewed-by: Matthew Brost <matthew.brost@intel.com>
Link: https://patch.msgid.link/20260407055107.2782450-2-tejas.upadhyay@intel.com
Signed-off-by: Tejas Upadhyay <tejas.upadhyay@intel.com>

diff --git a/drivers/gpu/drm/xe/xe_bo.c b/drivers/gpu/drm/xe/xe_bo.c
index a7c2dc7f224c36bd5315e64127241e8760515d00..daac53168dba093352d4519849e165b6098cb09d 100644 (file)
--- a/drivers/gpu/drm/xe/xe_bo.c
+++ b/drivers/gpu/drm/xe/xe_bo.c
@@ -173,19 +173,6 @@ mem_type_to_migrate(struct xe_device *xe, u32 mem_type)
        return tile->migrate;
 }
 
-static struct xe_vram_region *res_to_mem_region(struct ttm_resource *res)
-{
-       struct xe_device *xe = ttm_to_xe_device(res->bo->bdev);
-       struct ttm_resource_manager *mgr;
-       struct xe_ttm_vram_mgr *vram_mgr;
-
-       xe_assert(xe, resource_is_vram(res));
-       mgr = ttm_manager_type(&xe->ttm, res->mem_type);
-       vram_mgr = to_xe_ttm_vram_mgr(mgr);
-
-       return container_of(vram_mgr, struct xe_vram_region, ttm);
-}
-
 static void try_add_system(struct xe_device *xe, struct xe_bo *bo,
                           u32 bo_flags, u32 *c)
 {
@@ -635,7 +622,7 @@ static int xe_ttm_io_mem_reserve(struct ttm_device *bdev,
                return 0;
        case XE_PL_VRAM0:
        case XE_PL_VRAM1: {
-               struct xe_vram_region *vram = res_to_mem_region(mem);
+               struct xe_vram_region *vram = xe_map_resource_to_region(mem);
 
                if (!xe_ttm_resource_visible(mem))
                        return -EINVAL;
@@ -1642,7 +1629,7 @@ static unsigned long xe_ttm_io_mem_pfn(struct ttm_buffer_object *ttm_bo,
        if (ttm_bo->resource->mem_type == XE_PL_STOLEN)
                return xe_ttm_stolen_io_offset(bo, page_offset << PAGE_SHIFT) >> PAGE_SHIFT;
 
-       vram = res_to_mem_region(ttm_bo->resource);
+       vram = xe_map_resource_to_region(ttm_bo->resource);
        xe_res_first(ttm_bo->resource, (u64)page_offset << PAGE_SHIFT, 0, &cursor);
        return (vram->io_start + cursor.start) >> PAGE_SHIFT;
 }
@@ -1782,7 +1769,7 @@ static int xe_ttm_access_memory(struct ttm_buffer_object *ttm_bo,
                goto out;
        }
 
-       vram = res_to_mem_region(ttm_bo->resource);
+       vram = xe_map_resource_to_region(ttm_bo->resource);
        xe_res_first(ttm_bo->resource, offset & PAGE_MASK,
                     xe_bo_size(bo) - (offset & PAGE_MASK), &cursor);
 
@@ -2923,7 +2910,7 @@ uint64_t vram_region_gpu_offset(struct ttm_resource *res)
        case XE_PL_SYSTEM:
                return 0;
        default:
-               return res_to_mem_region(res)->dpa_base;
+               return xe_map_resource_to_region(res)->dpa_base;
        }
        return 0;
 }

diff --git a/drivers/gpu/drm/xe/xe_svm.c b/drivers/gpu/drm/xe/xe_svm.c
index 5933b2b6392b1a493f710950fbef7e8c6c8e020f..ba67355f64cb413263a00047e873095641ec1e1b 100644 (file)
--- a/drivers/gpu/drm/xe/xe_svm.c
+++ b/drivers/gpu/drm/xe/xe_svm.c
@@ -786,12 +786,12 @@ static int xe_svm_populate_devmem_pfn(struct drm_pagemap_devmem *devmem_allocati
        struct xe_bo *bo = to_xe_bo(devmem_allocation);
        struct ttm_resource *res = bo->ttm.resource;
        struct list_head *blocks = &to_xe_ttm_vram_mgr_resource(res)->blocks;
+       struct xe_vram_region *vr = xe_map_resource_to_region(res);
+       struct gpu_buddy *buddy = vram_to_buddy(vr);
        struct gpu_buddy_block *block;
        int j = 0;
 
        list_for_each_entry(block, blocks, link) {
-               struct xe_vram_region *vr = block->private;
-               struct gpu_buddy *buddy = vram_to_buddy(vr);
                u64 block_pfn = block_offset_to_pfn(devmem_allocation->dpagemap,
                                                    gpu_buddy_block_offset(block));
                int i;
@@ -1061,9 +1061,7 @@ static int xe_drm_pagemap_populate_mm(struct drm_pagemap *dpagemap,
        struct dma_fence *pre_migrate_fence = NULL;
        struct xe_device *xe = vr->xe;
        struct device *dev = xe->drm.dev;
-       struct gpu_buddy_block *block;
        struct xe_validation_ctx vctx;
-       struct list_head *blocks;
        struct drm_exec exec;
        struct xe_bo *bo;
        int err = 0, idx;
@@ -1100,10 +1098,6 @@ static int xe_drm_pagemap_populate_mm(struct drm_pagemap *dpagemap,
                                        &dpagemap_devmem_ops, dpagemap, end - start,
                                        pre_migrate_fence);
 
-               blocks = &to_xe_ttm_vram_mgr_resource(bo->ttm.resource)->blocks;
-               list_for_each_entry(block, blocks, link)
-                       block->private = vr;
-
                xe_bo_get(bo);
 
                /* Ensure the device has a pm ref while there are device pages active. */

diff --git a/drivers/gpu/drm/xe/xe_vram.c b/drivers/gpu/drm/xe/xe_vram.c
index 0538dcb8b18c834387890978a043c51c9195317a..23eb7edbdd572538d6315bd59ef16c8f821e1705 100644 (file)
--- a/drivers/gpu/drm/xe/xe_vram.c
+++ b/drivers/gpu/drm/xe/xe_vram.c
@@ -13,6 +13,7 @@
 #include "regs/xe_gt_regs.h"
 #include "regs/xe_regs.h"
 #include "xe_assert.h"
+#include "xe_bo.h"
 #include "xe_device.h"
 #include "xe_force_wake.h"
 #include "xe_gt_mcr.h"
@@ -249,6 +250,27 @@ static int vram_region_init(struct xe_device *xe, struct xe_vram_region *vram,
        return 0;
 }
 
+/**
+ * xe_map_resource_to_region - Map ttm resource to vram memory region
+ * @res: The ttm resource
+ *
+ * Get vram memory region using vram memory manager managing this resource
+ *
+ * Returns: pointer to xe_vram_region
+ */
+struct xe_vram_region *xe_map_resource_to_region(struct ttm_resource *res)
+{
+       struct xe_device *xe = ttm_to_xe_device(res->bo->bdev);
+       struct ttm_resource_manager *mgr;
+       struct xe_ttm_vram_mgr *vram_mgr;
+
+       xe_assert(xe, mem_type_is_vram(res->mem_type));
+       mgr = ttm_manager_type(&xe->ttm, res->mem_type);
+       vram_mgr = to_xe_ttm_vram_mgr(mgr);
+
+       return container_of(vram_mgr, struct xe_vram_region, ttm);
+}
+
 /**
  * xe_vram_probe() - Probe VRAM configuration
  * @xe: the &xe_device

diff --git a/drivers/gpu/drm/xe/xe_vram.h b/drivers/gpu/drm/xe/xe_vram.h
index 72860f714fc6651062f02602a8e65d9f906bf9ad..dd1c8bf1792234c3ddeba92d552b80e4ea726db2 100644 (file)
--- a/drivers/gpu/drm/xe/xe_vram.h
+++ b/drivers/gpu/drm/xe/xe_vram.h
@@ -10,7 +10,9 @@
 
 struct xe_device;
 struct xe_vram_region;
+struct ttm_resource;
 
+struct xe_vram_region *xe_map_resource_to_region(struct ttm_resource *res);
 int xe_vram_probe(struct xe_device *xe);
 
 struct xe_vram_region *xe_vram_region_alloc(struct xe_device *xe, u8 id, u32 placement);