drm/xe/display: Remove dereferences of ggtt for tile id

Obtain the id from the root tile. Likely this can be hardcoded to 0,
but use the clean solution of obtaining root id and doing that.

to_xe_device(ggtt->tile) can also be easily replaced with xe.

Reviewed-by: Matthew Brost <matthew.brost@intel.com>
Link: https://lore.kernel.org/r/20250505121924.921544-5-dev@lankhorst.se
Signed-off-by: Maarten Lankhorst <dev@lankhorst.se>

diff --git a/drivers/gpu/drm/xe/display/xe_fb_pin.c b/drivers/gpu/drm/xe/display/xe_fb_pin.c
index d918ae1c806182b3953b0bc4f40d6d7fe044eff1..d509def82b134d5f69aaf5f5a792757656292c12 100644 (file)
--- a/drivers/gpu/drm/xe/display/xe_fb_pin.c
+++ b/drivers/gpu/drm/xe/display/xe_fb_pin.c
@@ -199,14 +199,15 @@ static int __xe_pin_fb_vma_ggtt(const struct intel_framebuffer *fb,
        struct drm_gem_object *obj = intel_fb_bo(&fb->base);
        struct xe_bo *bo = gem_to_xe_bo(obj);
        struct xe_device *xe = to_xe_device(fb->base.dev);
-       struct xe_ggtt *ggtt = xe_device_get_root_tile(xe)->mem.ggtt;
+       struct xe_tile *tile0 = xe_device_get_root_tile(xe);
+       struct xe_ggtt *ggtt = tile0->mem.ggtt;
        u32 align;
        int ret;
 
        /* TODO: Consider sharing framebuffer mapping?
         * embed i915_vma inside intel_framebuffer
         */
-       xe_pm_runtime_get_noresume(tile_to_xe(ggtt->tile));
+       xe_pm_runtime_get_noresume(xe);
        ret = mutex_lock_interruptible(&ggtt->lock);
        if (ret)
                goto out;
@@ -215,8 +216,8 @@ static int __xe_pin_fb_vma_ggtt(const struct intel_framebuffer *fb,
        if (xe_bo_is_vram(bo) && ggtt->flags & XE_GGTT_FLAGS_64K)
                align = max_t(u32, align, SZ_64K);
 
-       if (bo->ggtt_node[ggtt->tile->id] && view->type == I915_GTT_VIEW_NORMAL) {
-               vma->node = bo->ggtt_node[ggtt->tile->id];
+       if (bo->ggtt_node[tile0->id] && view->type == I915_GTT_VIEW_NORMAL) {
+               vma->node = bo->ggtt_node[tile0->id];
        } else if (view->type == I915_GTT_VIEW_NORMAL) {
                u32 x, size = bo->ttm.base.size;
 
@@ -271,7 +272,7 @@ static int __xe_pin_fb_vma_ggtt(const struct intel_framebuffer *fb,
 out_unlock:
        mutex_unlock(&ggtt->lock);
 out:
-       xe_pm_runtime_put(tile_to_xe(ggtt->tile));
+       xe_pm_runtime_put(xe);
        return ret;
 }
 
@@ -348,7 +349,7 @@ err:
 
 static void __xe_unpin_fb_vma(struct i915_vma *vma)
 {
-       u8 tile_id = vma->node->ggtt->tile->id;
+       u8 tile_id = xe_device_get_root_tile(xe_bo_device(vma->bo))->id;
 
        if (!refcount_dec_and_test(&vma->ref))
                return;