drm/xe/client: use mem_type from the current resource
authorMatthew Auld <matthew.auld@intel.com>
Wed, 11 Sep 2024 15:55:29 +0000 (16:55 +0100)
committerMatthew Auld <matthew.auld@intel.com>
Thu, 12 Sep 2024 08:27:30 +0000 (09:27 +0100)
Rather extract the mem_type from the current resource. Checking the
first potential placement doesn't really tell us where the bo is
currently allocated, especially if there are multiple potential
placements.

Signed-off-by: Matthew Auld <matthew.auld@intel.com>
Cc: Himal Prasad Ghimiray <himal.prasad.ghimiray@intel.com>
Cc: Tejas Upadhyay <tejas.upadhyay@intel.com>
Cc: "Thomas Hellström" <thomas.hellstrom@linux.intel.com>
Reviewed-by: Matthew Brost <matthew.brost@intel.com>
Reviewed-by: Tejas Upadhyay <tejas.upadhyay@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240911155527.178910-7-matthew.auld@intel.com
drivers/gpu/drm/xe/xe_drm_client.c

index 95a05c5..c4add8b 100644 (file)
@@ -168,15 +168,10 @@ static void bo_meminfo(struct xe_bo *bo,
                       struct drm_memory_stats stats[TTM_NUM_MEM_TYPES])
 {
        u64 sz = bo->size;
-       u32 mem_type;
+       u32 mem_type = bo->ttm.resource->mem_type;
 
        xe_bo_assert_held(bo);
 
-       if (bo->placement.placement)
-               mem_type = bo->placement.placement->mem_type;
-       else
-               mem_type = XE_PL_TT;
-
        if (drm_gem_object_is_shared_for_memory_stats(&bo->ttm.base))
                stats[mem_type].shared += sz;
        else