[PATCH 1/4] fix "drm/xe: Cleanup some layering in GGTT"

[Lucas De Marchi]

This needs a better title before merging, like

	Subject: drm/xe: Fix NULL check in xe_ggtt_init()

Lucas De Marchi

On Tue, Mar 05, 2024 at 02:12:47PM +0100, Maarten Lankhorst wrote:
>The null check for GT is after calling gt_to_xe, fix it.
>
>Fixes: 3121fed0c51b ("drm/xe: Cleanup some layering in GGTT")
>Cc: Matthew Brost <matthew.brost at intel.com>
>Signed-off-by: Maarten Lankhorst <maarten.lankhorst at linux.intel.com>
>---
> drivers/gpu/drm/xe/xe_ggtt.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
>diff --git a/drivers/gpu/drm/xe/xe_ggtt.c b/drivers/gpu/drm/xe/xe_ggtt.c
>index 717d0e76277a..0435e1202c46 100644
>--- a/drivers/gpu/drm/xe/xe_ggtt.c
>+++ b/drivers/gpu/drm/xe/xe_ggtt.c
>@@ -251,7 +251,6 @@ int xe_ggtt_init(struct xe_ggtt *ggtt)
>
> static void ggtt_invalidate_gt_tlb(struct xe_gt *gt)
> {
>-	struct xe_device *xe = gt_to_xe(gt);
> 	int err;
>
> 	if (!gt)
>@@ -265,7 +264,7 @@ static void ggtt_invalidate_gt_tlb(struct xe_gt *gt)
> 	xe_force_wake_get(gt_to_fw(gt), XE_FW_GT);
> 	err = xe_gt_tlb_invalidation_ggtt(gt);
> 	if (err)
>-		drm_warn(&xe->drm, "xe_gt_tlb_invalidation_ggtt error=%d", err);
>+		drm_warn(&gt_to_xe(gt)->drm, "xe_gt_tlb_invalidation_ggtt error=%d", err);
> 	xe_force_wake_put(gt_to_fw(gt), XE_FW_GT);
> }
>
>-- 
>2.43.0
>