Skip to content

Commit 1fb12c5

Browse files
dceraolodanvet
authored andcommitted
drm/i915/guc: skip disabling CTBs before sanitizing the GuC
If we're about to sanitize the GuC, something might have going wrong beforehand, so we should avoid trying to talk to it. Even if GuC is still running fine, the sanitize will reset its internal state and clear the CTB registration, so there is still no need to explicitly do so. References: https://gitlab.freedesktop.org/drm/intel/-/issues/2469 Signed-off-by: Daniele Ceraolo Spurio <[email protected]> Signed-off-by: Matthew Brost <[email protected]> Reviewed-by: Matthew Brost <[email protected]> Cc: Michal Wajdeczko <[email protected]> Cc: John Harrison <[email protected]> Signed-off-by: Daniel Vetter <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
1 parent f4db23f commit 1fb12c5

File tree

1 file changed

+1
-7
lines changed

1 file changed

+1
-7
lines changed

drivers/gpu/drm/i915/gt/uc/intel_uc.c

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -504,7 +504,7 @@ static int __uc_init_hw(struct intel_uc *uc)
504504

505505
ret = intel_guc_sample_forcewake(guc);
506506
if (ret)
507-
goto err_communication;
507+
goto err_log_capture;
508508

509509
if (intel_uc_uses_guc_submission(uc))
510510
intel_guc_submission_enable(guc);
@@ -529,8 +529,6 @@ static int __uc_init_hw(struct intel_uc *uc)
529529
/*
530530
* We've failed to load the firmware :(
531531
*/
532-
err_communication:
533-
guc_disable_communication(guc);
534532
err_log_capture:
535533
__uc_capture_load_err_log(uc);
536534
err_out:
@@ -558,9 +556,6 @@ static void __uc_fini_hw(struct intel_uc *uc)
558556
if (intel_uc_uses_guc_submission(uc))
559557
intel_guc_submission_disable(guc);
560558

561-
if (guc_communication_enabled(guc))
562-
guc_disable_communication(guc);
563-
564559
__uc_sanitize(uc);
565560
}
566561

@@ -577,7 +572,6 @@ void intel_uc_reset_prepare(struct intel_uc *uc)
577572
if (!intel_guc_is_ready(guc))
578573
return;
579574

580-
guc_disable_communication(guc);
581575
__uc_sanitize(uc);
582576
}
583577

0 commit comments

Comments
 (0)