diff mbox

drm/i915: Fix misplaced '\n' in printing the GPU error's RING_HEAD

Message ID 20161012112246.19176-1-chris@chris-wilson.co.uk (mailing list archive)
State New, archived
Headers show

Commit Message

Chris Wilson Oct. 12, 2016, 11:22 a.m. UTC
'\n' is supposed to be at the end of the line, not in the middle.

Fixes: cdb324bde570 ("drm/i915: Show bounds of active request in the ring...")
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Mika Kuoppala <mika.kuoppala@intel.com>
---
 drivers/gpu/drm/i915/i915_gpu_error.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Saarinen, Jani Oct. 12, 2016, 1:11 p.m. UTC | #1
> Test kms_flip:

>         Subgroup basic-flip-vs-modeset:

>                 pass       -> DMESG-WARN (fi-skl-6770hq)

[  468.807117] [drm:skl_set_cdclk [i915]] *ERROR* failed to inform PCU about cdclk change
[  468.816844] [drm:intel_cpu_fifo_underrun_irq_handler [i915]] *ERROR* CPU pipe C FIFO underrun

> Test kms_pipe_crc_basic:

>         Subgroup nonblocking-crc-pipe-b-frame-sequence:

>                 pass       -> DMESG-WARN (fi-ilk-650)

[  445.727655] [drm:intel_pch_fifo_underrun_irq_handler [i915]] *ERROR* PCH transcoder B FIFO underrun
[  445.727682] [drm:intel_cpu_fifo_underrun_irq_handler [i915]] *ERROR* CPU pipe B FIFO underrun

> Test vgem_basic:

>         Subgroup unload:

>                 skip       -> PASS       (fi-hsw-4770)

> 

> fi-bdw-5557u     total:248  pass:232  dwarn:0   dfail:0   fail:0   skip:16

> fi-bsw-n3050     total:248  pass:205  dwarn:0   dfail:0   fail:0   skip:43

> fi-bxt-t5700     total:248  pass:217  dwarn:0   dfail:0   fail:0   skip:31

> fi-byt-j1900     total:248  pass:213  dwarn:2   dfail:0   fail:1   skip:32

> fi-byt-n2820     total:248  pass:211  dwarn:0   dfail:0   fail:1   skip:36

> fi-hsw-4770      total:248  pass:225  dwarn:0   dfail:0   fail:0   skip:23

> fi-hsw-4770r     total:248  pass:225  dwarn:0   dfail:0   fail:0   skip:23

> fi-ilk-650       total:248  pass:184  dwarn:1   dfail:0   fail:2   skip:61

> fi-ivb-3520m     total:248  pass:222  dwarn:0   dfail:0   fail:0   skip:26

> fi-ivb-3770      total:248  pass:222  dwarn:0   dfail:0   fail:0   skip:26

> fi-kbl-7200u     total:248  pass:223  dwarn:0   dfail:0   fail:0   skip:25

> fi-skl-6260u     total:248  pass:233  dwarn:0   dfail:0   fail:0   skip:15

> fi-skl-6700hq    total:248  pass:225  dwarn:0   dfail:0   fail:0   skip:23

> fi-skl-6700k     total:248  pass:222  dwarn:1   dfail:0   fail:0   skip:25

> fi-skl-6770hq    total:248  pass:230  dwarn:2   dfail:0   fail:1   skip:15

> fi-snb-2520m     total:248  pass:211  dwarn:0   dfail:0   fail:0   skip:37

> fi-snb-2600      total:248  pass:210  dwarn:0   dfail:0   fail:0   skip:38

> 

> Results at /archive/results/CI_IGT_test/Patchwork_2683/

> 

> 46271d41e30090d7fc996e8f5abde6a59f51038b drm-intel-nightly: 2016y-10m-

> 12d-11h-06m-41s UTC integration manifest

> 35edc31 drm/i915: Fix misplaced '\n' in printing the GPU error's RING_HEAD

> 

> _______________________________________________

> Intel-gfx mailing list

> Intel-gfx@lists.freedesktop.org

> https://lists.freedesktop.org/mailman/listinfo/intel-gfx



Jani Saarinen
Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo
Mika Kuoppala Oct. 13, 2016, 9:38 a.m. UTC | #2
Chris Wilson <chris@chris-wilson.co.uk> writes:

> '\n' is supposed to be at the end of the line, not in the middle.
>
> Fixes: cdb324bde570 ("drm/i915: Show bounds of active request in the ring...")
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: Mika Kuoppala <mika.kuoppala@intel.com>

Oopsie.

Reviewed-by: Mika Kuoppala <mika.kuoppala@intel.com>

> ---
>  drivers/gpu/drm/i915/i915_gpu_error.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_gpu_error.c b/drivers/gpu/drm/i915/i915_gpu_error.c
> index 2df4bc2af0bb..673750fc0d5b 100644
> --- a/drivers/gpu/drm/i915/i915_gpu_error.c
> +++ b/drivers/gpu/drm/i915/i915_gpu_error.c
> @@ -368,7 +368,7 @@ static void error_print_engine(struct drm_i915_error_state_buf *m,
>  {
>  	err_printf(m, "%s command stream:\n", engine_str(ee->engine_id));
>  	err_printf(m, "  START: 0x%08x\n", ee->start);
> -	err_printf(m, "  HEAD:  0x%08x\n [0x%08x]", ee->head, ee->rq_head);
> +	err_printf(m, "  HEAD:  0x%08x [0x%08x]\n", ee->head, ee->rq_head);
>  	err_printf(m, "  TAIL:  0x%08x [0x%08x, 0x%08x]\n",
>  		   ee->tail, ee->rq_post, ee->rq_tail);
>  	err_printf(m, "  CTL:   0x%08x\n", ee->ctl);
> -- 
> 2.9.3
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
diff mbox

Patch

diff --git a/drivers/gpu/drm/i915/i915_gpu_error.c b/drivers/gpu/drm/i915/i915_gpu_error.c
index 2df4bc2af0bb..673750fc0d5b 100644
--- a/drivers/gpu/drm/i915/i915_gpu_error.c
+++ b/drivers/gpu/drm/i915/i915_gpu_error.c
@@ -368,7 +368,7 @@  static void error_print_engine(struct drm_i915_error_state_buf *m,
 {
 	err_printf(m, "%s command stream:\n", engine_str(ee->engine_id));
 	err_printf(m, "  START: 0x%08x\n", ee->start);
-	err_printf(m, "  HEAD:  0x%08x\n [0x%08x]", ee->head, ee->rq_head);
+	err_printf(m, "  HEAD:  0x%08x [0x%08x]\n", ee->head, ee->rq_head);
 	err_printf(m, "  TAIL:  0x%08x [0x%08x, 0x%08x]\n",
 		   ee->tail, ee->rq_post, ee->rq_tail);
 	err_printf(m, "  CTL:   0x%08x\n", ee->ctl);