From: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
To: Chris Wilson <chris@chris-wilson.co.uk>, intel-gfx@lists.freedesktop.org
Subject: Re: [PATCH 2/2] drm/i915: Stop capturing semaphore registers for gen6/7 GPU hangs
Date: Tue, 5 Mar 2019 15:22:28 +0000 [thread overview]
Message-ID: <3bafcab9-1bd7-6e52-756d-9e2c5c4696f3@linux.intel.com> (raw)
In-Reply-To: <20190305150914.11340-2-chris@chris-wilson.co.uk>
On 05/03/2019 15:09, Chris Wilson wrote:
> We no longer use the semaphore sync registers on gen6/7, so including
> them in the GPU error state is mere noise.
>
> References: 6faf5916e6be ("drm/i915: Remove HW semaphores for gen7 inter-engine synchronisation")
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
> ---
> drivers/gpu/drm/i915/i915_gpu_error.c | 25 ++-----------------------
> drivers/gpu/drm/i915/i915_gpu_error.h | 1 -
> 2 files changed, 2 insertions(+), 24 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_gpu_error.c b/drivers/gpu/drm/i915/i915_gpu_error.c
> index fa86c60fb56c..ececbfd8ee82 100644
> --- a/drivers/gpu/drm/i915/i915_gpu_error.c
> +++ b/drivers/gpu/drm/i915/i915_gpu_error.c
> @@ -502,13 +502,6 @@ static void error_print_engine(struct drm_i915_error_state_buf *m,
> if (INTEL_GEN(m->i915) >= 6) {
> err_printf(m, " RC PSMI: 0x%08x\n", ee->rc_psmi);
> err_printf(m, " FAULT_REG: 0x%08x\n", ee->fault_reg);
> - err_printf(m, " SYNC_0: 0x%08x\n",
> - ee->semaphore_mboxes[0]);
> - err_printf(m, " SYNC_1: 0x%08x\n",
> - ee->semaphore_mboxes[1]);
> - if (HAS_VEBOX(m->i915))
> - err_printf(m, " SYNC_2: 0x%08x\n",
> - ee->semaphore_mboxes[2]);
> }
> if (HAS_PPGTT(m->i915)) {
> err_printf(m, " GFX_MODE: 0x%08x\n", ee->vm_info.gfx_mode);
> @@ -1138,18 +1131,6 @@ static void gem_record_fences(struct i915_gpu_state *error)
> error->nfence = i;
> }
>
> -static void gen6_record_semaphore_state(struct intel_engine_cs *engine,
> - struct drm_i915_error_engine *ee)
> -{
> - struct drm_i915_private *dev_priv = engine->i915;
> -
> - ee->semaphore_mboxes[0] = I915_READ(RING_SYNC_0(engine->mmio_base));
> - ee->semaphore_mboxes[1] = I915_READ(RING_SYNC_1(engine->mmio_base));
> - if (HAS_VEBOX(dev_priv))
> - ee->semaphore_mboxes[2] =
> - I915_READ(RING_SYNC_2(engine->mmio_base));
> -}
> -
> static void error_record_engine_registers(struct i915_gpu_state *error,
> struct intel_engine_cs *engine,
> struct drm_i915_error_engine *ee)
> @@ -1158,12 +1139,10 @@ static void error_record_engine_registers(struct i915_gpu_state *error,
>
> if (INTEL_GEN(dev_priv) >= 6) {
> ee->rc_psmi = I915_READ(RING_PSMI_CTL(engine->mmio_base));
> - if (INTEL_GEN(dev_priv) >= 8) {
> + if (INTEL_GEN(dev_priv) >= 8)
> ee->fault_reg = I915_READ(GEN8_RING_FAULT_REG);
> - } else {
> - gen6_record_semaphore_state(engine, ee);
> + else
> ee->fault_reg = I915_READ(RING_FAULT_REG(engine));
> - }
> }
>
> if (INTEL_GEN(dev_priv) >= 4) {
> diff --git a/drivers/gpu/drm/i915/i915_gpu_error.h b/drivers/gpu/drm/i915/i915_gpu_error.h
> index 8c1569c1830d..99d6b7b270c2 100644
> --- a/drivers/gpu/drm/i915/i915_gpu_error.h
> +++ b/drivers/gpu/drm/i915/i915_gpu_error.h
> @@ -111,7 +111,6 @@ struct i915_gpu_state {
> u32 fault_reg;
> u64 faddr;
> u32 rc_psmi; /* sleep state */
> - u32 semaphore_mboxes[I915_NUM_ENGINES - 1];
> struct intel_instdone instdone;
>
> struct drm_i915_error_context {
>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Regards,
Tvrtko
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2019-03-05 15:22 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-05 15:09 [PATCH 1/2] drm/i915: Just check the vebox IIR regardless Chris Wilson
2019-03-05 15:09 ` [PATCH 2/2] drm/i915: Stop capturing semaphore registers for gen6/7 GPU hangs Chris Wilson
2019-03-05 15:22 ` Tvrtko Ursulin [this message]
2019-03-05 15:19 ` ✗ Fi.CI.CHECKPATCH: warning for series starting with [1/2] drm/i915: Just check the vebox IIR regardless Patchwork
2019-03-05 15:20 ` ✗ Fi.CI.SPARSE: " Patchwork
2019-03-05 15:21 ` [PATCH 1/2] " Tvrtko Ursulin
2019-03-05 15:42 ` ✓ Fi.CI.BAT: success for series starting with [1/2] " Patchwork
2019-03-05 18:28 ` ✗ Fi.CI.IGT: failure " 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=3bafcab9-1bd7-6e52-756d-9e2c5c4696f3@linux.intel.com \
--to=tvrtko.ursulin@linux.intel.com \
--cc=chris@chris-wilson.co.uk \
--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: link
Be 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.