drm/xe: Move TLB invalidation reset before HW reset

This is a software reset which can be done immediately after stopping
the UC.

Signed-off-by: Matthew Brost <matthew.brost@intel.com>
Reviewed-by: Michal Wajdeczko <michal.wajdeczko@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240122210156.1517444-3-matthew.brost@intel.com

diff --git a/drivers/gpu/drm/xe/xe_gt.c b/drivers/gpu/drm/xe/xe_gt.c
index 47cb87f599e463ea1c2c9c74116c33c766c6fa60..675a2927a19ef1b857d9ac500c3429f2f60fd0b7 100644 (file)
--- a/drivers/gpu/drm/xe/xe_gt.c
+++ b/drivers/gpu/drm/xe/xe_gt.c
@@ -638,12 +638,12 @@ static int gt_reset(struct xe_gt *gt)
        if (err)
                goto err_out;
 
+       xe_gt_tlb_invalidation_reset(gt);
+
        err = do_gt_reset(gt);
        if (err)
                goto err_out;
 
-       xe_gt_tlb_invalidation_reset(gt);
-
        err = do_gt_restart(gt);
        if (err)
                goto err_out;