* [PATCH] drm/i915: Show ring->start for the ELSP context/request queue
@ 2018-05-02 7:54 Chris Wilson
2018-05-02 9:29 ` Mika Kuoppala
` (3 more replies)
0 siblings, 4 replies; 6+ messages in thread
From: Chris Wilson @ 2018-05-02 7:54 UTC (permalink / raw)
To: intel-gfx
Since the advent of execlists, the HW no longer executes from a single
statically assigned ring, but instead switches to a different ring for
each context (logical ringbuffer contexts as it is called). So a good way
to tally the executing context against what we have queued is by
comparing the RING_START register against our requests. Make it so.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com>
---
drivers/gpu/drm/i915/i915_gpu_error.c | 5 +++--
drivers/gpu/drm/i915/i915_gpu_error.h | 1 +
drivers/gpu/drm/i915/intel_engine_cs.c | 5 +++--
3 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_gpu_error.c b/drivers/gpu/drm/i915/i915_gpu_error.c
index c0127965b578..3c5a47cbd12d 100644
--- a/drivers/gpu/drm/i915/i915_gpu_error.c
+++ b/drivers/gpu/drm/i915/i915_gpu_error.c
@@ -409,11 +409,11 @@ static void error_print_request(struct drm_i915_error_state_buf *m,
if (!erq->seqno)
return;
- err_printf(m, "%s pid %d, ban score %d, seqno %8x:%08x, prio %d, emitted %dms ago, head %08x, tail %08x\n",
+ err_printf(m, "%s pid %d, ban score %d, seqno %8x:%08x, prio %d, emitted %dms ago, start %08x, head %08x, tail %08x\n",
prefix, erq->pid, erq->ban_score,
erq->context, erq->seqno, erq->sched_attr.priority,
jiffies_to_msecs(jiffies - erq->jiffies),
- erq->head, erq->tail);
+ erq->start, erq->head, erq->tail);
}
static void error_print_context(struct drm_i915_error_state_buf *m,
@@ -1282,6 +1282,7 @@ static void record_request(struct i915_request *request,
erq->ban_score = atomic_read(&request->ctx->ban_score);
erq->seqno = request->global_seqno;
erq->jiffies = request->emitted_jiffies;
+ erq->start = i915_ggtt_offset(request->ring->vma);
erq->head = request->head;
erq->tail = request->tail;
diff --git a/drivers/gpu/drm/i915/i915_gpu_error.h b/drivers/gpu/drm/i915/i915_gpu_error.h
index 5d6fdcbc092c..ad7c2328b31c 100644
--- a/drivers/gpu/drm/i915/i915_gpu_error.h
+++ b/drivers/gpu/drm/i915/i915_gpu_error.h
@@ -150,6 +150,7 @@ struct i915_gpu_state {
u32 context;
int ban_score;
u32 seqno;
+ u32 start;
u32 head;
u32 tail;
struct i915_sched_attr sched_attr;
diff --git a/drivers/gpu/drm/i915/intel_engine_cs.c b/drivers/gpu/drm/i915/intel_engine_cs.c
index 238c8d3da041..9164e6d665f8 100644
--- a/drivers/gpu/drm/i915/intel_engine_cs.c
+++ b/drivers/gpu/drm/i915/intel_engine_cs.c
@@ -1278,8 +1278,9 @@ static void intel_engine_print_registers(const struct intel_engine_cs *engine,
char hdr[80];
snprintf(hdr, sizeof(hdr),
- "\t\tELSP[%d] count=%d, rq: ",
- idx, count);
+ "\t\tELSP[%d] count=%d, ring->start=%08x, rq: ",
+ idx, count,
+ i915_ggtt_offset(rq->ring->vma));
print_request(m, rq, hdr);
} else {
drm_printf(m, "\t\tELSP[%d] idle\n", idx);
--
2.17.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] drm/i915: Show ring->start for the ELSP context/request queue
2018-05-02 7:54 [PATCH] drm/i915: Show ring->start for the ELSP context/request queue Chris Wilson
@ 2018-05-02 9:29 ` Mika Kuoppala
2018-05-02 16:38 ` Chris Wilson
2018-05-02 10:41 ` Chris Wilson
` (2 subsequent siblings)
3 siblings, 1 reply; 6+ messages in thread
From: Mika Kuoppala @ 2018-05-02 9:29 UTC (permalink / raw)
To: Chris Wilson, intel-gfx
Chris Wilson <chris@chris-wilson.co.uk> writes:
> Since the advent of execlists, the HW no longer executes from a single
> statically assigned ring, but instead switches to a different ring for
> each context (logical ringbuffer contexts as it is called). So a good way
> to tally the executing context against what we have queued is by
> comparing the RING_START register against our requests. Make it so.
>
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Reviewed-by: Mika Kuoppala <mika.kuoppala@linux.intel.com>
> ---
> drivers/gpu/drm/i915/i915_gpu_error.c | 5 +++--
> drivers/gpu/drm/i915/i915_gpu_error.h | 1 +
> drivers/gpu/drm/i915/intel_engine_cs.c | 5 +++--
> 3 files changed, 7 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_gpu_error.c b/drivers/gpu/drm/i915/i915_gpu_error.c
> index c0127965b578..3c5a47cbd12d 100644
> --- a/drivers/gpu/drm/i915/i915_gpu_error.c
> +++ b/drivers/gpu/drm/i915/i915_gpu_error.c
> @@ -409,11 +409,11 @@ static void error_print_request(struct drm_i915_error_state_buf *m,
> if (!erq->seqno)
> return;
>
> - err_printf(m, "%s pid %d, ban score %d, seqno %8x:%08x, prio %d, emitted %dms ago, head %08x, tail %08x\n",
> + err_printf(m, "%s pid %d, ban score %d, seqno %8x:%08x, prio %d, emitted %dms ago, start %08x, head %08x, tail %08x\n",
> prefix, erq->pid, erq->ban_score,
> erq->context, erq->seqno, erq->sched_attr.priority,
> jiffies_to_msecs(jiffies - erq->jiffies),
> - erq->head, erq->tail);
> + erq->start, erq->head, erq->tail);
> }
>
> static void error_print_context(struct drm_i915_error_state_buf *m,
> @@ -1282,6 +1282,7 @@ static void record_request(struct i915_request *request,
> erq->ban_score = atomic_read(&request->ctx->ban_score);
> erq->seqno = request->global_seqno;
> erq->jiffies = request->emitted_jiffies;
> + erq->start = i915_ggtt_offset(request->ring->vma);
> erq->head = request->head;
> erq->tail = request->tail;
>
> diff --git a/drivers/gpu/drm/i915/i915_gpu_error.h b/drivers/gpu/drm/i915/i915_gpu_error.h
> index 5d6fdcbc092c..ad7c2328b31c 100644
> --- a/drivers/gpu/drm/i915/i915_gpu_error.h
> +++ b/drivers/gpu/drm/i915/i915_gpu_error.h
> @@ -150,6 +150,7 @@ struct i915_gpu_state {
> u32 context;
> int ban_score;
> u32 seqno;
> + u32 start;
> u32 head;
> u32 tail;
> struct i915_sched_attr sched_attr;
> diff --git a/drivers/gpu/drm/i915/intel_engine_cs.c b/drivers/gpu/drm/i915/intel_engine_cs.c
> index 238c8d3da041..9164e6d665f8 100644
> --- a/drivers/gpu/drm/i915/intel_engine_cs.c
> +++ b/drivers/gpu/drm/i915/intel_engine_cs.c
> @@ -1278,8 +1278,9 @@ static void intel_engine_print_registers(const struct intel_engine_cs *engine,
> char hdr[80];
>
> snprintf(hdr, sizeof(hdr),
> - "\t\tELSP[%d] count=%d, rq: ",
> - idx, count);
> + "\t\tELSP[%d] count=%d, ring->start=%08x, rq: ",
> + idx, count,
> + i915_ggtt_offset(rq->ring->vma));
> print_request(m, rq, hdr);
> } else {
> drm_printf(m, "\t\tELSP[%d] idle\n", idx);
> --
> 2.17.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] drm/i915: Show ring->start for the ELSP context/request queue
2018-05-02 7:54 [PATCH] drm/i915: Show ring->start for the ELSP context/request queue Chris Wilson
2018-05-02 9:29 ` Mika Kuoppala
@ 2018-05-02 10:41 ` Chris Wilson
2018-05-02 14:14 ` ✓ Fi.CI.BAT: success for drm/i915: Show ring->start for the ELSP context/request queue (rev2) Patchwork
2018-05-02 18:23 ` ✓ Fi.CI.IGT: " Patchwork
3 siblings, 0 replies; 6+ messages in thread
From: Chris Wilson @ 2018-05-02 10:41 UTC (permalink / raw)
To: intel-gfx
Since the advent of execlists, the HW no longer executes from a single
statically assigned ring, but instead switches to a different ring for
each context (logical ringbuffer contexts as it is called). So a good way
to tally the executing context against what we have queued is by
comparing the RING_START register against our requests. Make it so.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Reviewed-by: Mika Kuoppala <mika.kuoppala@linux.intel.com>
---
Rebase after Mika
---
drivers/gpu/drm/i915/i915_gpu_error.c | 5 +++--
drivers/gpu/drm/i915/i915_gpu_error.h | 1 +
drivers/gpu/drm/i915/intel_engine_cs.c | 5 +++--
3 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_gpu_error.c b/drivers/gpu/drm/i915/i915_gpu_error.c
index 1176d068f88a..944939947d30 100644
--- a/drivers/gpu/drm/i915/i915_gpu_error.c
+++ b/drivers/gpu/drm/i915/i915_gpu_error.c
@@ -410,11 +410,11 @@ static void error_print_request(struct drm_i915_error_state_buf *m,
if (!erq->seqno)
return;
- err_printf(m, "%s pid %d, ban score %d, seqno %8x:%08x, prio %d, emitted %dms, head %08x, tail %08x\n",
+ err_printf(m, "%s pid %d, ban score %d, seqno %8x:%08x, prio %d, emitted %dms, start %08x, head %08x, tail %08x\n",
prefix, erq->pid, erq->ban_score,
erq->context, erq->seqno, erq->sched_attr.priority,
jiffies_to_msecs(erq->jiffies - epoch),
- erq->head, erq->tail);
+ erq->start, erq->head, erq->tail);
}
static void error_print_context(struct drm_i915_error_state_buf *m,
@@ -1292,6 +1292,7 @@ static void record_request(struct i915_request *request,
erq->ban_score = atomic_read(&request->ctx->ban_score);
erq->seqno = request->global_seqno;
erq->jiffies = request->emitted_jiffies;
+ erq->start = i915_ggtt_offset(request->ring->vma);
erq->head = request->head;
erq->tail = request->tail;
diff --git a/drivers/gpu/drm/i915/i915_gpu_error.h b/drivers/gpu/drm/i915/i915_gpu_error.h
index 0accd2ed72d9..dac0f8c4c1cf 100644
--- a/drivers/gpu/drm/i915/i915_gpu_error.h
+++ b/drivers/gpu/drm/i915/i915_gpu_error.h
@@ -152,6 +152,7 @@ struct i915_gpu_state {
u32 context;
int ban_score;
u32 seqno;
+ u32 start;
u32 head;
u32 tail;
struct i915_sched_attr sched_attr;
diff --git a/drivers/gpu/drm/i915/intel_engine_cs.c b/drivers/gpu/drm/i915/intel_engine_cs.c
index 238c8d3da041..9164e6d665f8 100644
--- a/drivers/gpu/drm/i915/intel_engine_cs.c
+++ b/drivers/gpu/drm/i915/intel_engine_cs.c
@@ -1278,8 +1278,9 @@ static void intel_engine_print_registers(const struct intel_engine_cs *engine,
char hdr[80];
snprintf(hdr, sizeof(hdr),
- "\t\tELSP[%d] count=%d, rq: ",
- idx, count);
+ "\t\tELSP[%d] count=%d, ring->start=%08x, rq: ",
+ idx, count,
+ i915_ggtt_offset(rq->ring->vma));
print_request(m, rq, hdr);
} else {
drm_printf(m, "\t\tELSP[%d] idle\n", idx);
--
2.17.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 6+ messages in thread
* ✓ Fi.CI.BAT: success for drm/i915: Show ring->start for the ELSP context/request queue (rev2)
2018-05-02 7:54 [PATCH] drm/i915: Show ring->start for the ELSP context/request queue Chris Wilson
2018-05-02 9:29 ` Mika Kuoppala
2018-05-02 10:41 ` Chris Wilson
@ 2018-05-02 14:14 ` Patchwork
2018-05-02 18:23 ` ✓ Fi.CI.IGT: " Patchwork
3 siblings, 0 replies; 6+ messages in thread
From: Patchwork @ 2018-05-02 14:14 UTC (permalink / raw)
To: Chris Wilson; +Cc: intel-gfx
== Series Details ==
Series: drm/i915: Show ring->start for the ELSP context/request queue (rev2)
URL : https://patchwork.freedesktop.org/series/42550/
State : success
== Summary ==
= CI Bug Log - changes from CI_DRM_4121 -> Patchwork_8873 =
== Summary - SUCCESS ==
No regressions found.
External URL: https://patchwork.freedesktop.org/api/1.0/series/42550/revisions/2/mbox/
== Known issues ==
Here are the changes found in Patchwork_8873 that come from known issues:
=== IGT changes ===
==== Possible fixes ====
igt@kms_pipe_crc_basic@suspend-read-crc-pipe-b:
fi-snb-2520m: INCOMPLETE (fdo#103713) -> PASS
igt@kms_pipe_crc_basic@suspend-read-crc-pipe-c:
fi-ivb-3520m: DMESG-WARN (fdo#106084) -> PASS
fdo#103713 https://bugs.freedesktop.org/show_bug.cgi?id=103713
fdo#106084 https://bugs.freedesktop.org/show_bug.cgi?id=106084
== Participating hosts (40 -> 36) ==
Missing (4): fi-ctg-p8600 fi-skl-6700hq fi-ilk-m540 fi-skl-6260u
== Build changes ==
* Linux: CI_DRM_4121 -> Patchwork_8873
CI_DRM_4121: d4f7520d80ab83ea9053ee080df09a23463b6966 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4456: 43761534c6482dc67b9c3d8eeecd425ef40b3c4c @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_8873: 269ba3215e634fbc700c60b5f4fcfa22924c8aab @ git://anongit.freedesktop.org/gfx-ci/linux
piglit_4456: 30b992bdc047073e1fe99b1ac622f026618a8081 @ git://anongit.freedesktop.org/piglit
== Linux commits ==
269ba3215e63 drm/i915: Show ring->start for the ELSP context/request queue
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_8873/issues.html
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] drm/i915: Show ring->start for the ELSP context/request queue
2018-05-02 9:29 ` Mika Kuoppala
@ 2018-05-02 16:38 ` Chris Wilson
0 siblings, 0 replies; 6+ messages in thread
From: Chris Wilson @ 2018-05-02 16:38 UTC (permalink / raw)
To: Mika Kuoppala, intel-gfx
Quoting Mika Kuoppala (2018-05-02 10:29:35)
> Chris Wilson <chris@chris-wilson.co.uk> writes:
>
> > Since the advent of execlists, the HW no longer executes from a single
> > statically assigned ring, but instead switches to a different ring for
> > each context (logical ringbuffer contexts as it is called). So a good way
> > to tally the executing context against what we have queued is by
> > comparing the RING_START register against our requests. Make it so.
> >
> > Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> > Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com>
>
> Reviewed-by: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Pushed, thanks for the review.
-Chris
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 6+ messages in thread
* ✓ Fi.CI.IGT: success for drm/i915: Show ring->start for the ELSP context/request queue (rev2)
2018-05-02 7:54 [PATCH] drm/i915: Show ring->start for the ELSP context/request queue Chris Wilson
` (2 preceding siblings ...)
2018-05-02 14:14 ` ✓ Fi.CI.BAT: success for drm/i915: Show ring->start for the ELSP context/request queue (rev2) Patchwork
@ 2018-05-02 18:23 ` Patchwork
3 siblings, 0 replies; 6+ messages in thread
From: Patchwork @ 2018-05-02 18:23 UTC (permalink / raw)
To: Chris Wilson; +Cc: intel-gfx
== Series Details ==
Series: drm/i915: Show ring->start for the ELSP context/request queue (rev2)
URL : https://patchwork.freedesktop.org/series/42550/
State : success
== Summary ==
= CI Bug Log - changes from CI_DRM_4121_full -> Patchwork_8873_full =
== Summary - WARNING ==
Minor unknown changes coming with Patchwork_8873_full need to be verified
manually.
If you think the reported changes have nothing to do with the changes
introduced in Patchwork_8873_full, please notify your bug team to allow them
to document this new failure mode, which will reduce false positives in CI.
External URL: https://patchwork.freedesktop.org/api/1.0/series/42550/revisions/2/mbox/
== Possible new issues ==
Here are the unknown changes that may have been introduced in Patchwork_8873_full:
=== IGT changes ===
==== Warnings ====
igt@gem_exec_schedule@deep-vebox:
shard-kbl: SKIP -> PASS +1
igt@pm_rc6_residency@rc6-accuracy:
shard-snb: SKIP -> PASS
== Known issues ==
Here are the changes found in Patchwork_8873_full that come from known issues:
=== IGT changes ===
==== Issues hit ====
igt@kms_flip@absolute-wf_vblank-interruptible:
shard-kbl: PASS -> FAIL (fdo#106087)
igt@kms_flip@flip-vs-absolute-wf_vblank-interruptible:
shard-apl: PASS -> FAIL (fdo#100368)
igt@kms_flip@flip-vs-expired-vblank:
shard-kbl: PASS -> FAIL (fdo#105363, fdo#102887)
igt@kms_flip@flip-vs-expired-vblank-interruptible:
shard-glk: PASS -> FAIL (fdo#102887)
igt@kms_flip@wf_vblank-ts-check-interruptible:
shard-glk: PASS -> FAIL (fdo#100368) +1
igt@kms_frontbuffer_tracking@fbc-rgb565-draw-pwrite:
shard-apl: PASS -> FAIL (fdo#103167)
==== Possible fixes ====
igt@kms_flip@2x-plain-flip-ts-check:
shard-hsw: FAIL (fdo#100368) -> PASS +1
igt@kms_flip@plain-flip-ts-check-interruptible:
shard-glk: FAIL (fdo#100368) -> PASS
igt@kms_frontbuffer_tracking@fbc-1p-primscrn-pri-indfb-draw-mmap-cpu:
shard-apl: FAIL (fdo#103167) -> PASS
igt@perf@blocking:
shard-hsw: FAIL (fdo#102252) -> PASS
fdo#100368 https://bugs.freedesktop.org/show_bug.cgi?id=100368
fdo#102252 https://bugs.freedesktop.org/show_bug.cgi?id=102252
fdo#102887 https://bugs.freedesktop.org/show_bug.cgi?id=102887
fdo#103167 https://bugs.freedesktop.org/show_bug.cgi?id=103167
fdo#105363 https://bugs.freedesktop.org/show_bug.cgi?id=105363
fdo#106087 https://bugs.freedesktop.org/show_bug.cgi?id=106087
== Participating hosts (7 -> 7) ==
No changes in participating hosts
== Build changes ==
* Linux: CI_DRM_4121 -> Patchwork_8873
CI_DRM_4121: d4f7520d80ab83ea9053ee080df09a23463b6966 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4456: 43761534c6482dc67b9c3d8eeecd425ef40b3c4c @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_8873: 269ba3215e634fbc700c60b5f4fcfa22924c8aab @ git://anongit.freedesktop.org/gfx-ci/linux
piglit_4456: 30b992bdc047073e1fe99b1ac622f026618a8081 @ git://anongit.freedesktop.org/piglit
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_8873/shards.html
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2018-05-02 18:23 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-05-02 7:54 [PATCH] drm/i915: Show ring->start for the ELSP context/request queue Chris Wilson
2018-05-02 9:29 ` Mika Kuoppala
2018-05-02 16:38 ` Chris Wilson
2018-05-02 10:41 ` Chris Wilson
2018-05-02 14:14 ` ✓ Fi.CI.BAT: success for drm/i915: Show ring->start for the ELSP context/request queue (rev2) Patchwork
2018-05-02 18:23 ` ✓ Fi.CI.IGT: " Patchwork
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.