On 17/04/24 19:20, Michal Wajdeczko wrote: > > On 17.04.2024 10:41, Aravind Iddamsetty wrote: >> This would be used in other places outside of gt_reset path. >> >> Cc: Lucas De Marchi <lucas.demarchi@xxxxxxxxx> >> >> Reviewed-by: Rodrigo Vivi <rodrigo.vivi@xxxxxxxxx> >> Signed-off-by: Aravind Iddamsetty <aravind.iddamsetty@xxxxxxxxxxxxxxx> >> --- >> drivers/gpu/drm/xe/xe_gt.c | 31 +++++++++++++++++++++---------- >> drivers/gpu/drm/xe/xe_gt.h | 1 + >> 2 files changed, 22 insertions(+), 10 deletions(-) >> >> diff --git a/drivers/gpu/drm/xe/xe_gt.c b/drivers/gpu/drm/xe/xe_gt.c >> index cfa5da900461..59f497d575ad 100644 >> --- a/drivers/gpu/drm/xe/xe_gt.c >> +++ b/drivers/gpu/drm/xe/xe_gt.c >> @@ -629,6 +629,26 @@ static int do_gt_restart(struct xe_gt *gt) >> return 0; >> } >> >> +/* Idle the GT */ > as this is a public function, can we have a proper kernel-doc here? > > and maybe some hint what should be done if this function fails? Ok will do. Thanks, Aravind. > >> +int xe_gt_idle(struct xe_gt *gt) >> +{ >> + int err; >> + >> + xe_gt_sanitize(gt); >> + >> + xe_uc_gucrc_disable(>->uc); >> + xe_uc_stop_prepare(>->uc); >> + xe_gt_pagefault_reset(gt); >> + >> + err = xe_uc_stop(>->uc); >> + if (err) >> + return err; >> + >> + xe_gt_tlb_invalidation_reset(gt); >> + >> + return err; >> +} >> + >> static int gt_reset(struct xe_gt *gt) >> { >> int err; >> @@ -645,21 +665,12 @@ static int gt_reset(struct xe_gt *gt) >> } >> >> xe_pm_runtime_get(gt_to_xe(gt)); >> - xe_gt_sanitize(gt); >> >> err = xe_force_wake_get(gt_to_fw(gt), XE_FORCEWAKE_ALL); >> if (err) >> goto err_msg; >> >> - xe_uc_gucrc_disable(>->uc); >> - xe_uc_stop_prepare(>->uc); >> - xe_gt_pagefault_reset(gt); >> - >> - err = xe_uc_stop(>->uc); >> - if (err) >> - goto err_out; >> - >> - xe_gt_tlb_invalidation_reset(gt); >> + xe_gt_idle(gt); >> >> err = do_gt_reset(gt); >> if (err) >> diff --git a/drivers/gpu/drm/xe/xe_gt.h b/drivers/gpu/drm/xe/xe_gt.h >> index ed6ea8057e35..d62af1725ff6 100644 >> --- a/drivers/gpu/drm/xe/xe_gt.h >> +++ b/drivers/gpu/drm/xe/xe_gt.h >> @@ -43,6 +43,7 @@ int xe_gt_resume(struct xe_gt *gt); >> void xe_gt_reset_async(struct xe_gt *gt); >> void xe_gt_sanitize(struct xe_gt *gt); >> void xe_gt_remove(struct xe_gt *gt); >> +int xe_gt_idle(struct xe_gt *gt); >> >> /** >> * xe_gt_any_hw_engine_by_reset_domain - scan the list of engines and return the