From: Matthew Brost <matthew.brost@intel.com> To: <intel-gfx@lists.freedesktop.org>, <dri-devel@lists.freedesktop.org> Cc: Michal.Wajdeczko@intel.com Subject: [PATCH 01/18] drm/i915/guc: skip disabling CTBs before sanitizing the GuC Date: Tue, 25 May 2021 23:42:20 -0700 [thread overview] Message-ID: <20210526064237.77853-2-matthew.brost@intel.com> (raw) In-Reply-To: <20210526064237.77853-1-matthew.brost@intel.com> From: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com> 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 <daniele.ceraolospurio@intel.com> Signed-off-by: Matthew Brost <matthew.brost@intel.com> Reviewed-by: Matthew Brost <matthew.brost@intel.com> Cc: Michal Wajdeczko <michal.wajdeczko@intel.com> Cc: John Harrison <John.C.Harrison@Intel.com> --- drivers/gpu/drm/i915/gt/uc/intel_uc.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc.c b/drivers/gpu/drm/i915/gt/uc/intel_uc.c index 6abb8f2dc33d..892c1315ce49 100644 --- a/drivers/gpu/drm/i915/gt/uc/intel_uc.c +++ b/drivers/gpu/drm/i915/gt/uc/intel_uc.c @@ -504,7 +504,7 @@ static int __uc_init_hw(struct intel_uc *uc) ret = intel_guc_sample_forcewake(guc); if (ret) - goto err_communication; + goto err_log_capture; if (intel_uc_uses_guc_submission(uc)) intel_guc_submission_enable(guc); @@ -529,8 +529,6 @@ static int __uc_init_hw(struct intel_uc *uc) /* * We've failed to load the firmware :( */ -err_communication: - guc_disable_communication(guc); err_log_capture: __uc_capture_load_err_log(uc); err_out: @@ -558,9 +556,6 @@ static void __uc_fini_hw(struct intel_uc *uc) if (intel_uc_uses_guc_submission(uc)) intel_guc_submission_disable(guc); - if (guc_communication_enabled(guc)) - guc_disable_communication(guc); - __uc_sanitize(uc); } @@ -577,7 +572,6 @@ void intel_uc_reset_prepare(struct intel_uc *uc) if (!intel_guc_is_ready(guc)) return; - guc_disable_communication(guc); __uc_sanitize(uc); } -- 2.28.0
WARNING: multiple messages have this Message-ID (diff)
From: Matthew Brost <matthew.brost@intel.com> To: <intel-gfx@lists.freedesktop.org>, <dri-devel@lists.freedesktop.org> Subject: [Intel-gfx] [PATCH 01/18] drm/i915/guc: skip disabling CTBs before sanitizing the GuC Date: Tue, 25 May 2021 23:42:20 -0700 [thread overview] Message-ID: <20210526064237.77853-2-matthew.brost@intel.com> (raw) In-Reply-To: <20210526064237.77853-1-matthew.brost@intel.com> From: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com> 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 <daniele.ceraolospurio@intel.com> Signed-off-by: Matthew Brost <matthew.brost@intel.com> Reviewed-by: Matthew Brost <matthew.brost@intel.com> Cc: Michal Wajdeczko <michal.wajdeczko@intel.com> Cc: John Harrison <John.C.Harrison@Intel.com> --- drivers/gpu/drm/i915/gt/uc/intel_uc.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc.c b/drivers/gpu/drm/i915/gt/uc/intel_uc.c index 6abb8f2dc33d..892c1315ce49 100644 --- a/drivers/gpu/drm/i915/gt/uc/intel_uc.c +++ b/drivers/gpu/drm/i915/gt/uc/intel_uc.c @@ -504,7 +504,7 @@ static int __uc_init_hw(struct intel_uc *uc) ret = intel_guc_sample_forcewake(guc); if (ret) - goto err_communication; + goto err_log_capture; if (intel_uc_uses_guc_submission(uc)) intel_guc_submission_enable(guc); @@ -529,8 +529,6 @@ static int __uc_init_hw(struct intel_uc *uc) /* * We've failed to load the firmware :( */ -err_communication: - guc_disable_communication(guc); err_log_capture: __uc_capture_load_err_log(uc); err_out: @@ -558,9 +556,6 @@ static void __uc_fini_hw(struct intel_uc *uc) if (intel_uc_uses_guc_submission(uc)) intel_guc_submission_disable(guc); - if (guc_communication_enabled(guc)) - guc_disable_communication(guc); - __uc_sanitize(uc); } @@ -577,7 +572,6 @@ void intel_uc_reset_prepare(struct intel_uc *uc) if (!intel_guc_is_ready(guc)) return; - guc_disable_communication(guc); __uc_sanitize(uc); } -- 2.28.0 _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2021-05-26 6:25 UTC|newest] Thread overview: 62+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-05-26 6:42 [PATCH 00/18] Non-interface changing GuC CTBs updates Matthew Brost 2021-05-26 6:42 ` [Intel-gfx] " Matthew Brost 2021-05-26 6:42 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for Non-interface changing GuC CTBs updates (rev2) Patchwork 2021-05-27 17:13 ` John Harrison 2021-05-27 17:09 ` Matthew Brost 2021-05-26 6:42 ` Matthew Brost [this message] 2021-05-26 6:42 ` [Intel-gfx] [PATCH 01/18] drm/i915/guc: skip disabling CTBs before sanitizing the GuC Matthew Brost 2021-05-26 6:42 ` [PATCH 02/18] drm/i915/guc: use probe_error log for CT enablement failure Matthew Brost 2021-05-26 6:42 ` [Intel-gfx] " Matthew Brost 2021-05-26 6:42 ` [PATCH 03/18] drm/i915/guc: enable only the user interrupt when using GuC submission Matthew Brost 2021-05-26 6:42 ` [Intel-gfx] " Matthew Brost 2021-05-26 6:42 ` [PATCH 04/18] drm/i915/guc: Remove sample_forcewake h2g action Matthew Brost 2021-05-26 6:42 ` [Intel-gfx] " Matthew Brost 2021-05-26 6:42 ` [PATCH 05/18] drm/i915/guc: Keep strict GuC ABI definitions Matthew Brost 2021-05-26 6:42 ` [Intel-gfx] " Matthew Brost 2021-05-26 6:42 ` [PATCH 06/18] drm/i915/guc: Drop guc->interrupts.enabled Matthew Brost 2021-05-26 6:42 ` [Intel-gfx] " Matthew Brost 2021-05-27 17:17 ` John Harrison 2021-05-27 17:17 ` John Harrison 2021-05-27 17:13 ` Matthew Brost 2021-05-27 17:13 ` Matthew Brost 2021-05-26 6:42 ` [PATCH 07/18] drm/i915/guc: Stop using fence/status from CTB descriptor Matthew Brost 2021-05-26 6:42 ` [Intel-gfx] " Matthew Brost 2021-05-26 6:42 ` [PATCH 08/18] drm/i915: Promote ptrdiff() to i915_utils.h Matthew Brost 2021-05-26 6:42 ` [Intel-gfx] " Matthew Brost 2021-05-26 6:42 ` [PATCH 09/18] drm/i915/guc: Only rely on own CTB size Matthew Brost 2021-05-26 6:42 ` [Intel-gfx] " Matthew Brost 2021-05-26 6:42 ` [PATCH 10/18] drm/i915/guc: Don't repeat CTB layout calculations Matthew Brost 2021-05-26 6:42 ` [Intel-gfx] " Matthew Brost 2021-05-26 6:42 ` [PATCH 11/18] drm/i915/guc: Replace CTB array with explicit members Matthew Brost 2021-05-26 6:42 ` [Intel-gfx] " Matthew Brost 2021-05-26 6:42 ` [PATCH 12/18] drm/i915/guc: Update sizes of CTB buffers Matthew Brost 2021-05-26 6:42 ` [Intel-gfx] " Matthew Brost 2021-05-26 6:42 ` [PATCH 13/18] drm/i915/guc: Relax CTB response timeout Matthew Brost 2021-05-26 6:42 ` [Intel-gfx] " Matthew Brost 2021-05-26 12:25 ` Michal Wajdeczko 2021-05-26 12:25 ` [Intel-gfx] " Michal Wajdeczko 2021-05-26 17:38 ` Matthew Brost 2021-05-26 17:38 ` [Intel-gfx] " Matthew Brost 2021-05-26 6:42 ` [PATCH 14/18] drm/i915/guc: Start protecting access to CTB descriptors Matthew Brost 2021-05-26 6:42 ` [Intel-gfx] " Matthew Brost 2021-05-26 6:42 ` [PATCH 15/18] drm/i915/guc: Ensure H2G buffer updates visible before tail update Matthew Brost 2021-05-26 6:42 ` [Intel-gfx] " Matthew Brost 2021-05-26 12:36 ` Michal Wajdeczko 2021-05-26 12:36 ` [Intel-gfx] " Michal Wajdeczko 2021-05-26 17:58 ` Matthew Brost 2021-05-26 17:58 ` [Intel-gfx] " Matthew Brost 2021-05-28 1:13 ` John Harrison 2021-05-28 1:13 ` John Harrison 2021-05-28 6:52 ` Michal Wajdeczko 2021-05-28 6:52 ` Michal Wajdeczko 2021-05-26 6:42 ` [PATCH 16/18] drm/i915/guc: Stop using mutex while sending CTB messages Matthew Brost 2021-05-26 6:42 ` [Intel-gfx] " Matthew Brost 2021-05-26 6:42 ` [PATCH 17/18] drm/i915/guc: Don't receive all G2H messages in irq handler Matthew Brost 2021-05-26 6:42 ` [Intel-gfx] " Matthew Brost 2021-05-26 6:42 ` [PATCH 18/18] drm/i915/guc: Always copy CT message to new allocation Matthew Brost 2021-05-26 6:42 ` [Intel-gfx] " Matthew Brost 2021-05-26 6:43 ` [Intel-gfx] ✗ Fi.CI.SPARSE: warning for Non-interface changing GuC CTBs updates (rev2) Patchwork 2021-05-27 17:13 ` John Harrison 2021-05-27 17:08 ` Matthew Brost 2021-05-26 7:11 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork 2021-05-26 9:47 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20210526064237.77853-2-matthew.brost@intel.com \ --to=matthew.brost@intel.com \ --cc=Michal.Wajdeczko@intel.com \ --cc=dri-devel@lists.freedesktop.org \ --cc=intel-gfx@lists.freedesktop.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.