* [PATCH] drm/i915: Stop reporting error details in dmesg as well as the error-state
@ 2016-10-19 12:52 Chris Wilson
2016-10-19 15:23 ` ✗ Fi.CI.BAT: failure for " Patchwork
2016-10-20 10:47 ` [PATCH] " Mika Kuoppala
0 siblings, 2 replies; 5+ messages in thread
From: Chris Wilson @ 2016-10-19 12:52 UTC (permalink / raw)
To: intel-gfx
As we already capture all the information from the registers into the
error-state, also dumping that to dmesg just generates noise that upsets
CI and users alike (and doesn't provide us with any more information).
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
---
drivers/gpu/drm/i915/i915_irq.c | 86 ++++++-----------------------------------
1 file changed, 11 insertions(+), 75 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
index 4c40a13d26e4..1d4bc67d27d4 100644
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -2578,90 +2578,26 @@ i915_err_print_instdone(struct drm_i915_private *dev_priv,
slice, subslice, instdone->row[slice][subslice]);
}
-static void i915_report_and_clear_eir(struct drm_i915_private *dev_priv)
+static void i915_clear_error_registers(struct drm_i915_private *dev_priv)
{
- struct intel_instdone instdone;
- u32 eir = I915_READ(EIR);
- int pipe;
-
- if (!eir)
- return;
-
- pr_err("render error detected, EIR: 0x%08x\n", eir);
-
- intel_engine_get_instdone(dev_priv->engine[RCS], &instdone);
-
- if (IS_G4X(dev_priv)) {
- if (eir & (GM45_ERROR_MEM_PRIV | GM45_ERROR_CP_PRIV)) {
- u32 ipeir = I915_READ(IPEIR_I965);
-
- pr_err(" IPEIR: 0x%08x\n", I915_READ(IPEIR_I965));
- pr_err(" IPEHR: 0x%08x\n", I915_READ(IPEHR_I965));
- i915_err_print_instdone(dev_priv, &instdone);
- pr_err(" INSTPS: 0x%08x\n", I915_READ(INSTPS));
- pr_err(" ACTHD: 0x%08x\n", I915_READ(ACTHD_I965));
- I915_WRITE(IPEIR_I965, ipeir);
- POSTING_READ(IPEIR_I965);
- }
- if (eir & GM45_ERROR_PAGE_TABLE) {
- u32 pgtbl_err = I915_READ(PGTBL_ER);
- pr_err("page table error\n");
- pr_err(" PGTBL_ER: 0x%08x\n", pgtbl_err);
- I915_WRITE(PGTBL_ER, pgtbl_err);
- POSTING_READ(PGTBL_ER);
- }
- }
+ u32 eir;
- if (!IS_GEN2(dev_priv)) {
- if (eir & I915_ERROR_PAGE_TABLE) {
- u32 pgtbl_err = I915_READ(PGTBL_ER);
- pr_err("page table error\n");
- pr_err(" PGTBL_ER: 0x%08x\n", pgtbl_err);
- I915_WRITE(PGTBL_ER, pgtbl_err);
- POSTING_READ(PGTBL_ER);
- }
- }
+ if (!IS_GEN2(dev_priv))
+ I915_WRITE(PGTBL_ER, I915_READ(PGTBL_ER));
- if (eir & I915_ERROR_MEMORY_REFRESH) {
- pr_err("memory refresh error:\n");
- for_each_pipe(dev_priv, pipe)
- pr_err("pipe %c stat: 0x%08x\n",
- pipe_name(pipe), I915_READ(PIPESTAT(pipe)));
- /* pipestat has already been acked */
- }
- if (eir & I915_ERROR_INSTRUCTION) {
- pr_err("instruction error\n");
- pr_err(" INSTPM: 0x%08x\n", I915_READ(INSTPM));
- i915_err_print_instdone(dev_priv, &instdone);
- if (INTEL_GEN(dev_priv) < 4) {
- u32 ipeir = I915_READ(IPEIR);
-
- pr_err(" IPEIR: 0x%08x\n", I915_READ(IPEIR));
- pr_err(" IPEHR: 0x%08x\n", I915_READ(IPEHR));
- pr_err(" ACTHD: 0x%08x\n", I915_READ(ACTHD));
- I915_WRITE(IPEIR, ipeir);
- POSTING_READ(IPEIR);
- } else {
- u32 ipeir = I915_READ(IPEIR_I965);
-
- pr_err(" IPEIR: 0x%08x\n", I915_READ(IPEIR_I965));
- pr_err(" IPEHR: 0x%08x\n", I915_READ(IPEHR_I965));
- pr_err(" INSTPS: 0x%08x\n", I915_READ(INSTPS));
- pr_err(" ACTHD: 0x%08x\n", I915_READ(ACTHD_I965));
- I915_WRITE(IPEIR_I965, ipeir);
- POSTING_READ(IPEIR_I965);
- }
- }
+ if (INTEL_GEN(dev_priv) < 4)
+ I915_WRITE(IPEIR, I915_READ(IPEIR));
+ else
+ I915_WRITE(IPEIR_I965, I915_READ(IPEIR_I965));
- I915_WRITE(EIR, eir);
- POSTING_READ(EIR);
+ I915_WRITE(EIR, I915_READ(EIR));
eir = I915_READ(EIR);
if (eir) {
/*
* some errors might have become stuck,
* mask them.
*/
- DRM_ERROR("EIR stuck: 0x%08x, masking\n", eir);
+ DRM_DEBUG_DRIVER("EIR stuck: 0x%08x, masking\n", eir);
I915_WRITE(EMR, I915_READ(EMR) | eir);
I915_WRITE(IIR, I915_RENDER_COMMAND_PARSER_ERROR_INTERRUPT);
}
@@ -2690,7 +2626,7 @@ void i915_handle_error(struct drm_i915_private *dev_priv,
va_end(args);
i915_capture_error_state(dev_priv, engine_mask, error_msg);
- i915_report_and_clear_eir(dev_priv);
+ i915_clear_error_registers(dev_priv);
if (!engine_mask)
return;
--
2.9.3
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 5+ messages in thread
* ✗ Fi.CI.BAT: failure for drm/i915: Stop reporting error details in dmesg as well as the error-state
2016-10-19 12:52 [PATCH] drm/i915: Stop reporting error details in dmesg as well as the error-state Chris Wilson
@ 2016-10-19 15:23 ` Patchwork
2016-10-20 10:47 ` [PATCH] " Mika Kuoppala
1 sibling, 0 replies; 5+ messages in thread
From: Patchwork @ 2016-10-19 15:23 UTC (permalink / raw)
To: Chris Wilson; +Cc: intel-gfx
== Series Details ==
Series: drm/i915: Stop reporting error details in dmesg as well as the error-state
URL : https://patchwork.freedesktop.org/series/14021/
State : failure
== Summary ==
Series 14021v1 drm/i915: Stop reporting error details in dmesg as well as the error-state
https://patchwork.freedesktop.org/api/1.0/series/14021/revisions/1/mbox/
Test drv_module_reload_basic:
pass -> DMESG-WARN (fi-skl-6770hq)
dmesg-warn -> PASS (fi-skl-6700hq)
Test gem_exec_suspend:
Subgroup basic-s3:
pass -> DMESG-WARN (fi-skl-6770hq)
pass -> DMESG-WARN (fi-skl-6700hq)
fail -> DMESG-WARN (fi-ilk-650)
incomplete -> PASS (fi-snb-2520m)
Test kms_busy:
Subgroup basic-flip-default-a:
pass -> DMESG-WARN (fi-ilk-650)
Subgroup basic-flip-default-b:
pass -> DMESG-WARN (fi-ilk-650)
Test kms_cursor_legacy:
Subgroup basic-busy-flip-before-cursor-legacy:
pass -> DMESG-WARN (fi-ilk-650)
Subgroup basic-busy-flip-before-cursor-varying-size:
pass -> DMESG-WARN (fi-ilk-650)
Subgroup basic-flip-after-cursor-legacy:
pass -> DMESG-WARN (fi-ilk-650)
Subgroup basic-flip-after-cursor-varying-size:
pass -> DMESG-WARN (fi-ilk-650)
Subgroup basic-flip-before-cursor-legacy:
pass -> DMESG-WARN (fi-ilk-650)
Subgroup basic-flip-before-cursor-varying-size:
pass -> DMESG-WARN (fi-ilk-650)
Test kms_flip:
Subgroup basic-flip-vs-dpms:
pass -> DMESG-WARN (fi-ilk-650)
Subgroup basic-flip-vs-modeset:
pass -> DMESG-WARN (fi-ilk-650)
Subgroup basic-flip-vs-wf_vblank:
pass -> DMESG-WARN (fi-ilk-650)
Subgroup basic-plain-flip:
pass -> DMESG-WARN (fi-ilk-650)
Test kms_force_connector_basic:
Subgroup force-load-detect:
incomplete -> PASS (fi-ivb-3770)
incomplete -> PASS (fi-byt-j1900)
Test kms_frontbuffer_tracking:
Subgroup basic:
pass -> FAIL (fi-skl-6770hq)
Test kms_pipe_crc_basic:
Subgroup hang-read-crc-pipe-a:
pass -> DMESG-WARN (fi-ilk-650)
Subgroup hang-read-crc-pipe-b:
pass -> DMESG-WARN (fi-ilk-650)
Subgroup nonblocking-crc-pipe-a:
pass -> DMESG-WARN (fi-ilk-650)
Subgroup nonblocking-crc-pipe-a-frame-sequence:
pass -> DMESG-WARN (fi-ilk-650)
Subgroup nonblocking-crc-pipe-b:
pass -> DMESG-WARN (fi-ilk-650)
Subgroup nonblocking-crc-pipe-b-frame-sequence:
pass -> DMESG-WARN (fi-ilk-650)
Subgroup read-crc-pipe-a:
pass -> DMESG-WARN (fi-ilk-650)
Subgroup read-crc-pipe-a-frame-sequence:
pass -> DMESG-WARN (fi-ilk-650)
Subgroup read-crc-pipe-b:
pass -> DMESG-WARN (fi-ilk-650)
Subgroup read-crc-pipe-b-frame-sequence:
pass -> DMESG-WARN (fi-ilk-650)
Subgroup suspend-read-crc-pipe-a:
pass -> DMESG-WARN (fi-skl-6700hq)
fail -> DMESG-WARN (fi-ilk-650)
Subgroup suspend-read-crc-pipe-b:
pass -> DMESG-WARN (fi-skl-6700hq)
fail -> DMESG-WARN (fi-ilk-650)
pass -> INCOMPLETE (fi-snb-2600)
Subgroup suspend-read-crc-pipe-c:
pass -> DMESG-WARN (fi-skl-6700hq)
fi-bdw-5557u total:246 pass:231 dwarn:0 dfail:0 fail:0 skip:15
fi-bsw-n3050 total:246 pass:203 dwarn:1 dfail:0 fail:0 skip:42
fi-bxt-t5700 total:246 pass:216 dwarn:0 dfail:0 fail:0 skip:30
fi-byt-j1900 total:209 pass:178 dwarn:1 dfail:0 fail:1 skip:28
fi-byt-n2820 total:246 pass:209 dwarn:1 dfail:0 fail:1 skip:35
fi-hsw-4770 total:246 pass:224 dwarn:0 dfail:0 fail:0 skip:22
fi-hsw-4770r total:246 pass:223 dwarn:1 dfail:0 fail:0 skip:22
fi-ilk-650 total:246 pass:159 dwarn:25 dfail:0 fail:2 skip:60
fi-ivb-3520m total:246 pass:221 dwarn:0 dfail:0 fail:0 skip:25
fi-ivb-3770 total:246 pass:221 dwarn:0 dfail:0 fail:0 skip:25
fi-kbl-7200u total:246 pass:222 dwarn:0 dfail:0 fail:0 skip:24
fi-skl-6260u total:246 pass:232 dwarn:0 dfail:0 fail:0 skip:14
fi-skl-6700hq total:246 pass:219 dwarn:4 dfail:0 fail:0 skip:23
fi-skl-6700k total:246 pass:221 dwarn:1 dfail:0 fail:0 skip:24
fi-skl-6770hq total:246 pass:229 dwarn:2 dfail:0 fail:1 skip:14
fi-snb-2520m total:246 pass:210 dwarn:0 dfail:0 fail:0 skip:36
fi-snb-2600 total:209 pass:176 dwarn:0 dfail:0 fail:0 skip:32
Results at /archive/results/CI_IGT_test/Patchwork_2761/
d5cbeba648bec880aa0e1f7a531e684499a079a7 drm-intel-nightly: 2016y-10m-19d-11h-13m-08s UTC integration manifest
9025827 drm/i915: Stop reporting error details in dmesg as well as the error-state
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] drm/i915: Stop reporting error details in dmesg as well as the error-state
2016-10-19 12:52 [PATCH] drm/i915: Stop reporting error details in dmesg as well as the error-state Chris Wilson
2016-10-19 15:23 ` ✗ Fi.CI.BAT: failure for " Patchwork
@ 2016-10-20 10:47 ` Mika Kuoppala
2016-10-20 10:56 ` Chris Wilson
1 sibling, 1 reply; 5+ messages in thread
From: Mika Kuoppala @ 2016-10-20 10:47 UTC (permalink / raw)
To: Chris Wilson, intel-gfx
Chris Wilson <chris@chris-wilson.co.uk> writes:
> As we already capture all the information from the registers into the
> error-state, also dumping that to dmesg just generates noise that upsets
> CI and users alike (and doesn't provide us with any more information).
>
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> ---
> drivers/gpu/drm/i915/i915_irq.c | 86 ++++++-----------------------------------
> 1 file changed, 11 insertions(+), 75 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
> index 4c40a13d26e4..1d4bc67d27d4 100644
> --- a/drivers/gpu/drm/i915/i915_irq.c
> +++ b/drivers/gpu/drm/i915/i915_irq.c
> @@ -2578,90 +2578,26 @@ i915_err_print_instdone(struct drm_i915_private *dev_priv,
> slice, subslice, instdone->row[slice][subslice]);
> }
>
> -static void i915_report_and_clear_eir(struct drm_i915_private *dev_priv)
> +static void i915_clear_error_registers(struct drm_i915_private *dev_priv)
> {
> - struct intel_instdone instdone;
> - u32 eir = I915_READ(EIR);
> - int pipe;
> -
> - if (!eir)
> - return;
> -
> - pr_err("render error detected, EIR: 0x%08x\n", eir);
> -
> - intel_engine_get_instdone(dev_priv->engine[RCS], &instdone);
> -
> - if (IS_G4X(dev_priv)) {
> - if (eir & (GM45_ERROR_MEM_PRIV | GM45_ERROR_CP_PRIV)) {
> - u32 ipeir = I915_READ(IPEIR_I965);
> -
> - pr_err(" IPEIR: 0x%08x\n", I915_READ(IPEIR_I965));
> - pr_err(" IPEHR: 0x%08x\n", I915_READ(IPEHR_I965));
> - i915_err_print_instdone(dev_priv, &instdone);
> - pr_err(" INSTPS: 0x%08x\n", I915_READ(INSTPS));
> - pr_err(" ACTHD: 0x%08x\n",
> I915_READ(ACTHD_I965));
But these are what we lose. They are not in the error state.
-Mika
> - I915_WRITE(IPEIR_I965, ipeir);
> - POSTING_READ(IPEIR_I965);
> - }
> - if (eir & GM45_ERROR_PAGE_TABLE) {
> - u32 pgtbl_err = I915_READ(PGTBL_ER);
> - pr_err("page table error\n");
> - pr_err(" PGTBL_ER: 0x%08x\n", pgtbl_err);
> - I915_WRITE(PGTBL_ER, pgtbl_err);
> - POSTING_READ(PGTBL_ER);
> - }
> - }
> + u32 eir;
>
> - if (!IS_GEN2(dev_priv)) {
> - if (eir & I915_ERROR_PAGE_TABLE) {
> - u32 pgtbl_err = I915_READ(PGTBL_ER);
> - pr_err("page table error\n");
> - pr_err(" PGTBL_ER: 0x%08x\n", pgtbl_err);
> - I915_WRITE(PGTBL_ER, pgtbl_err);
> - POSTING_READ(PGTBL_ER);
> - }
> - }
> + if (!IS_GEN2(dev_priv))
> + I915_WRITE(PGTBL_ER, I915_READ(PGTBL_ER));
>
> - if (eir & I915_ERROR_MEMORY_REFRESH) {
> - pr_err("memory refresh error:\n");
> - for_each_pipe(dev_priv, pipe)
> - pr_err("pipe %c stat: 0x%08x\n",
> - pipe_name(pipe), I915_READ(PIPESTAT(pipe)));
> - /* pipestat has already been acked */
> - }
> - if (eir & I915_ERROR_INSTRUCTION) {
> - pr_err("instruction error\n");
> - pr_err(" INSTPM: 0x%08x\n", I915_READ(INSTPM));
> - i915_err_print_instdone(dev_priv, &instdone);
> - if (INTEL_GEN(dev_priv) < 4) {
> - u32 ipeir = I915_READ(IPEIR);
> -
> - pr_err(" IPEIR: 0x%08x\n", I915_READ(IPEIR));
> - pr_err(" IPEHR: 0x%08x\n", I915_READ(IPEHR));
> - pr_err(" ACTHD: 0x%08x\n", I915_READ(ACTHD));
> - I915_WRITE(IPEIR, ipeir);
> - POSTING_READ(IPEIR);
> - } else {
> - u32 ipeir = I915_READ(IPEIR_I965);
> -
> - pr_err(" IPEIR: 0x%08x\n", I915_READ(IPEIR_I965));
> - pr_err(" IPEHR: 0x%08x\n", I915_READ(IPEHR_I965));
> - pr_err(" INSTPS: 0x%08x\n", I915_READ(INSTPS));
> - pr_err(" ACTHD: 0x%08x\n", I915_READ(ACTHD_I965));
> - I915_WRITE(IPEIR_I965, ipeir);
> - POSTING_READ(IPEIR_I965);
> - }
> - }
> + if (INTEL_GEN(dev_priv) < 4)
> + I915_WRITE(IPEIR, I915_READ(IPEIR));
> + else
> + I915_WRITE(IPEIR_I965, I915_READ(IPEIR_I965));
>
> - I915_WRITE(EIR, eir);
> - POSTING_READ(EIR);
> + I915_WRITE(EIR, I915_READ(EIR));
> eir = I915_READ(EIR);
> if (eir) {
> /*
> * some errors might have become stuck,
> * mask them.
> */
> - DRM_ERROR("EIR stuck: 0x%08x, masking\n", eir);
> + DRM_DEBUG_DRIVER("EIR stuck: 0x%08x, masking\n", eir);
> I915_WRITE(EMR, I915_READ(EMR) | eir);
> I915_WRITE(IIR, I915_RENDER_COMMAND_PARSER_ERROR_INTERRUPT);
> }
> @@ -2690,7 +2626,7 @@ void i915_handle_error(struct drm_i915_private *dev_priv,
> va_end(args);
>
> i915_capture_error_state(dev_priv, engine_mask, error_msg);
> - i915_report_and_clear_eir(dev_priv);
> + i915_clear_error_registers(dev_priv);
>
> if (!engine_mask)
> return;
> --
> 2.9.3
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] drm/i915: Stop reporting error details in dmesg as well as the error-state
2016-10-20 10:47 ` [PATCH] " Mika Kuoppala
@ 2016-10-20 10:56 ` Chris Wilson
2016-10-20 11:45 ` Mika Kuoppala
0 siblings, 1 reply; 5+ messages in thread
From: Chris Wilson @ 2016-10-20 10:56 UTC (permalink / raw)
To: Mika Kuoppala; +Cc: intel-gfx
On Thu, Oct 20, 2016 at 01:47:28PM +0300, Mika Kuoppala wrote:
> Chris Wilson <chris@chris-wilson.co.uk> writes:
>
> > As we already capture all the information from the registers into the
> > error-state, also dumping that to dmesg just generates noise that upsets
> > CI and users alike (and doesn't provide us with any more information).
> >
> > Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> > ---
> > drivers/gpu/drm/i915/i915_irq.c | 86 ++++++-----------------------------------
> > 1 file changed, 11 insertions(+), 75 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
> > index 4c40a13d26e4..1d4bc67d27d4 100644
> > --- a/drivers/gpu/drm/i915/i915_irq.c
> > +++ b/drivers/gpu/drm/i915/i915_irq.c
> > @@ -2578,90 +2578,26 @@ i915_err_print_instdone(struct drm_i915_private *dev_priv,
> > slice, subslice, instdone->row[slice][subslice]);
> > }
> >
> > -static void i915_report_and_clear_eir(struct drm_i915_private *dev_priv)
> > +static void i915_clear_error_registers(struct drm_i915_private *dev_priv)
> > {
> > - struct intel_instdone instdone;
> > - u32 eir = I915_READ(EIR);
> > - int pipe;
> > -
> > - if (!eir)
> > - return;
> > -
> > - pr_err("render error detected, EIR: 0x%08x\n", eir);
> > -
> > - intel_engine_get_instdone(dev_priv->engine[RCS], &instdone);
> > -
> > - if (IS_G4X(dev_priv)) {
> > - if (eir & (GM45_ERROR_MEM_PRIV | GM45_ERROR_CP_PRIV)) {
> > - u32 ipeir = I915_READ(IPEIR_I965);
> > -
> > - pr_err(" IPEIR: 0x%08x\n", I915_READ(IPEIR_I965));
> > - pr_err(" IPEHR: 0x%08x\n", I915_READ(IPEHR_I965));
> > - i915_err_print_instdone(dev_priv, &instdone);
> > - pr_err(" INSTPS: 0x%08x\n", I915_READ(INSTPS));
> > - pr_err(" ACTHD: 0x%08x\n",
> > I915_READ(ACTHD_I965));
>
> But these are what we lose. They are not in the error state.
EIR, IPEIR, IPEHR, INSTPS, and ACTHD (note these are per-ring) are all in
the error state. What am I missing?
-Chris
--
Chris Wilson, Intel Open Source Technology Centre
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] drm/i915: Stop reporting error details in dmesg as well as the error-state
2016-10-20 10:56 ` Chris Wilson
@ 2016-10-20 11:45 ` Mika Kuoppala
0 siblings, 0 replies; 5+ messages in thread
From: Mika Kuoppala @ 2016-10-20 11:45 UTC (permalink / raw)
To: Chris Wilson; +Cc: intel-gfx
Chris Wilson <chris@chris-wilson.co.uk> writes:
> On Thu, Oct 20, 2016 at 01:47:28PM +0300, Mika Kuoppala wrote:
>> Chris Wilson <chris@chris-wilson.co.uk> writes:
>>
>> > As we already capture all the information from the registers into the
>> > error-state, also dumping that to dmesg just generates noise that upsets
>> > CI and users alike (and doesn't provide us with any more information).
>> >
>> > Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
>> > ---
>> > drivers/gpu/drm/i915/i915_irq.c | 86 ++++++-----------------------------------
>> > 1 file changed, 11 insertions(+), 75 deletions(-)
>> >
>> > diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
>> > index 4c40a13d26e4..1d4bc67d27d4 100644
>> > --- a/drivers/gpu/drm/i915/i915_irq.c
>> > +++ b/drivers/gpu/drm/i915/i915_irq.c
>> > @@ -2578,90 +2578,26 @@ i915_err_print_instdone(struct drm_i915_private *dev_priv,
>> > slice, subslice, instdone->row[slice][subslice]);
>> > }
>> >
>> > -static void i915_report_and_clear_eir(struct drm_i915_private *dev_priv)
>> > +static void i915_clear_error_registers(struct drm_i915_private *dev_priv)
>> > {
>> > - struct intel_instdone instdone;
>> > - u32 eir = I915_READ(EIR);
>> > - int pipe;
>> > -
>> > - if (!eir)
>> > - return;
>> > -
>> > - pr_err("render error detected, EIR: 0x%08x\n", eir);
>> > -
>> > - intel_engine_get_instdone(dev_priv->engine[RCS], &instdone);
>> > -
>> > - if (IS_G4X(dev_priv)) {
>> > - if (eir & (GM45_ERROR_MEM_PRIV | GM45_ERROR_CP_PRIV)) {
>> > - u32 ipeir = I915_READ(IPEIR_I965);
>> > -
>> > - pr_err(" IPEIR: 0x%08x\n", I915_READ(IPEIR_I965));
>> > - pr_err(" IPEHR: 0x%08x\n", I915_READ(IPEHR_I965));
>> > - i915_err_print_instdone(dev_priv, &instdone);
>> > - pr_err(" INSTPS: 0x%08x\n", I915_READ(INSTPS));
>> > - pr_err(" ACTHD: 0x%08x\n",
>> > I915_READ(ACTHD_I965));
>>
>> But these are what we lose. They are not in the error state.
>
> EIR, IPEIR, IPEHR, INSTPS, and ACTHD (note these are per-ring) are all in
> the error state. What am I missing?
Grep picked up stuff from i810_regs.h and I was fooled. My bad.
Indeed they are already in the error state so the commit message
is correct about the information we already have.
Reviewed-by: Mika Kuoppala <mika.kuoppala@intel.com>
> -Chris
>
> --
> Chris Wilson, Intel Open Source Technology Centre
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2016-10-20 11:47 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-10-19 12:52 [PATCH] drm/i915: Stop reporting error details in dmesg as well as the error-state Chris Wilson
2016-10-19 15:23 ` ✗ Fi.CI.BAT: failure for " Patchwork
2016-10-20 10:47 ` [PATCH] " Mika Kuoppala
2016-10-20 10:56 ` Chris Wilson
2016-10-20 11:45 ` Mika Kuoppala
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.