]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
drm/xe: Fix GT "for each engine" workarounds
authorTvrtko Ursulin <tvrtko.ursulin@igalia.com>
Thu, 27 Feb 2025 10:13:00 +0000 (10:13 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 13 Mar 2025 12:01:56 +0000 (13:01 +0100)
commit 54f94dc7f6b4db45dbc23b4db3d20c7194e2c54f upstream.

Any rules using engine matching are currently broken due RTP processing
happening too in early init, before the list of hardware engines has been
initialised.

Fix this by moving workaround processing to later in the driver probe
sequence, to just before the processed list is used for the first time.

Looking at the debugfs gt0/workarounds on ADL-P we notice 14011060649
should be present while we see, before:

 GT Workarounds
     14011059788
     14015795083

And with the patch:

 GT Workarounds
     14011060649
     14011059788
     14015795083

Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@igalia.com>
Cc: Lucas De Marchi <lucas.demarchi@intel.com>
Cc: Matt Roper <matthew.d.roper@intel.com>
Cc: stable@vger.kernel.org # v6.11+
Reviewed-by: Lucas De Marchi <lucas.demarchi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20250227101304.46660-2-tvrtko.ursulin@igalia.com
Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
(cherry picked from commit 25d434cef791e03cf40680f5441b576c639bfa84)
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/gpu/drm/xe/xe_gt.c

index b940688c3613562a7e2d1817b65537be6d2653ba..98fe8573e054e97a6cbfcb0996e684368ee9298d 100644 (file)
@@ -379,9 +379,7 @@ int xe_gt_init_early(struct xe_gt *gt)
        if (err)
                return err;
 
-       xe_wa_process_gt(gt);
        xe_wa_process_oob(gt);
-       xe_tuning_process_gt(gt);
 
        xe_force_wake_init_gt(gt, gt_to_fw(gt));
        spin_lock_init(&gt->global_invl_lock);
@@ -469,6 +467,8 @@ static int all_fw_domain_init(struct xe_gt *gt)
                goto err_hw_fence_irq;
 
        xe_gt_mcr_set_implicit_defaults(gt);
+       xe_wa_process_gt(gt);
+       xe_tuning_process_gt(gt);
        xe_reg_sr_apply_mmio(&gt->reg_sr, gt);
 
        err = xe_gt_clock_init(gt);