* [PATCH 1/2] drm/i915: Remove debugfs/i915_seqno_info
@ 2017-12-09 10:44 Chris Wilson
2017-12-09 10:44 ` [PATCH 2/2] drm/i915: Stop showing seqno info from debugfs/i915_interrupt_info Chris Wilson
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Chris Wilson @ 2017-12-09 10:44 UTC (permalink / raw)
To: intel-gfx
The per-engine seqno info is now available from
debugfs/i915_engine_info obsoleting debugfs/i915_seqno_info, so remove it.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
---
drivers/gpu/drm/i915/i915_debugfs.c | 14 --------------
1 file changed, 14 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
index 9ccc6bcc7069..bebf33333ae3 100644
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -683,19 +683,6 @@ static void i915_ring_seqno_info(struct seq_file *m,
spin_unlock_irq(&b->rb_lock);
}
-static int i915_gem_seqno_info(struct seq_file *m, void *data)
-{
- struct drm_i915_private *dev_priv = node_to_i915(m->private);
- struct intel_engine_cs *engine;
- enum intel_engine_id id;
-
- for_each_engine(engine, dev_priv, id)
- i915_ring_seqno_info(m, engine);
-
- return 0;
-}
-
-
static int i915_interrupt_info(struct seq_file *m, void *data)
{
struct drm_i915_private *dev_priv = node_to_i915(m->private);
@@ -4672,7 +4659,6 @@ static const struct drm_info_list i915_debugfs_list[] = {
{"i915_gem_objects", i915_gem_object_info, 0},
{"i915_gem_gtt", i915_gem_gtt_info, 0},
{"i915_gem_stolen", i915_gem_stolen_list_info },
- {"i915_gem_seqno", i915_gem_seqno_info, 0},
{"i915_gem_fence_regs", i915_gem_fence_regs_info, 0},
{"i915_gem_interrupt", i915_interrupt_info, 0},
{"i915_gem_batch_pool", i915_gem_batch_pool_info, 0},
--
2.15.1
_______________________________________________
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* [PATCH 2/2] drm/i915: Stop showing seqno info from debugfs/i915_interrupt_info
2017-12-09 10:44 [PATCH 1/2] drm/i915: Remove debugfs/i915_seqno_info Chris Wilson
@ 2017-12-09 10:44 ` Chris Wilson
2017-12-11 9:08 ` Joonas Lahtinen
2017-12-09 11:15 ` ✗ Fi.CI.BAT: warning for series starting with [1/2] drm/i915: Remove debugfs/i915_seqno_info Patchwork
2017-12-11 9:07 ` [PATCH 1/2] " Joonas Lahtinen
2 siblings, 1 reply; 6+ messages in thread
From: Chris Wilson @ 2017-12-09 10:44 UTC (permalink / raw)
To: intel-gfx
Since the seqno information shown from i915_interrupt_info is just a
small subset of i915_engine_info, remove it.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
---
drivers/gpu/drm/i915/i915_debugfs.c | 24 ++----------------------
drivers/gpu/drm/i915/intel_engine_cs.c | 5 +++++
2 files changed, 7 insertions(+), 22 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
index bebf33333ae3..f91dd68c53a1 100644
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -664,25 +664,6 @@ static int i915_gem_batch_pool_info(struct seq_file *m, void *data)
return 0;
}
-static void i915_ring_seqno_info(struct seq_file *m,
- struct intel_engine_cs *engine)
-{
- struct intel_breadcrumbs *b = &engine->breadcrumbs;
- struct rb_node *rb;
-
- seq_printf(m, "Current sequence (%s): %x\n",
- engine->name, intel_engine_get_seqno(engine));
-
- spin_lock_irq(&b->rb_lock);
- for (rb = rb_first(&b->waiters); rb; rb = rb_next(rb)) {
- struct intel_wait *w = rb_entry(rb, typeof(*w), node);
-
- seq_printf(m, "Waiting (%s): %s [%d] on %x\n",
- engine->name, w->tsk->comm, w->tsk->pid, w->seqno);
- }
- spin_unlock_irq(&b->rb_lock);
-}
-
static int i915_interrupt_info(struct seq_file *m, void *data)
{
struct drm_i915_private *dev_priv = node_to_i915(m->private);
@@ -883,13 +864,12 @@ static int i915_interrupt_info(struct seq_file *m, void *data)
seq_printf(m, "Graphics Interrupt mask: %08x\n",
I915_READ(GTIMR));
}
- for_each_engine(engine, dev_priv, id) {
- if (INTEL_GEN(dev_priv) >= 6) {
+ if (INTEL_GEN(dev_priv) >= 6) {
+ for_each_engine(engine, dev_priv, id) {
seq_printf(m,
"Graphics Interrupt mask (%s): %08x\n",
engine->name, I915_READ_IMR(engine));
}
- i915_ring_seqno_info(m, engine);
}
intel_runtime_pm_put(dev_priv);
diff --git a/drivers/gpu/drm/i915/intel_engine_cs.c b/drivers/gpu/drm/i915/intel_engine_cs.c
index 04c31475a7ae..f879e183bd92 100644
--- a/drivers/gpu/drm/i915/intel_engine_cs.c
+++ b/drivers/gpu/drm/i915/intel_engine_cs.c
@@ -1690,6 +1690,11 @@ void intel_engine_dump(struct intel_engine_cs *engine,
if (i915_terminally_wedged(&engine->i915->gpu_error))
drm_printf(m, "*** WEDGED ***\n");
+ if (INTEL_GEN(dev_priv) >= 6) {
+ drm_printf(m, "\tInterrupt mask: %08x\n",
+ I915_READ_IMR(engine));
+ }
+
drm_printf(m, "\tcurrent seqno %x, last %x, hangcheck %x [%d ms], inflight %d\n",
intel_engine_get_seqno(engine),
intel_engine_last_submit(engine),
--
2.15.1
_______________________________________________
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 2/2] drm/i915: Stop showing seqno info from debugfs/i915_interrupt_info
2017-12-09 10:44 ` [PATCH 2/2] drm/i915: Stop showing seqno info from debugfs/i915_interrupt_info Chris Wilson
@ 2017-12-11 9:08 ` Joonas Lahtinen
2017-12-11 11:03 ` Chris Wilson
0 siblings, 1 reply; 6+ messages in thread
From: Joonas Lahtinen @ 2017-12-11 9:08 UTC (permalink / raw)
To: Chris Wilson, intel-gfx
On Sat, 2017-12-09 at 10:44 +0000, Chris Wilson wrote:
> Since the seqno information shown from i915_interrupt_info is just a
> small subset of i915_engine_info, remove it.
>
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
One comment below.
Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
> +++ b/drivers/gpu/drm/i915/intel_engine_cs.c
> @@ -1690,6 +1690,11 @@ void intel_engine_dump(struct intel_engine_cs *engine,
> if (i915_terminally_wedged(&engine->i915->gpu_error))
> drm_printf(m, "*** WEDGED ***\n");
>
> + if (INTEL_GEN(dev_priv) >= 6) {
> + drm_printf(m, "\tInterrupt mask: %08x\n",
> + I915_READ_IMR(engine));
Next printf is not capitalized.
Regards, Joonas
--
Joonas Lahtinen
Open Source Technology Center
Intel Corporation
_______________________________________________
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 2/2] drm/i915: Stop showing seqno info from debugfs/i915_interrupt_info
2017-12-11 9:08 ` Joonas Lahtinen
@ 2017-12-11 11:03 ` Chris Wilson
0 siblings, 0 replies; 6+ messages in thread
From: Chris Wilson @ 2017-12-11 11:03 UTC (permalink / raw)
To: Joonas Lahtinen, intel-gfx
Quoting Joonas Lahtinen (2017-12-11 09:08:53)
> On Sat, 2017-12-09 at 10:44 +0000, Chris Wilson wrote:
> > Since the seqno information shown from i915_interrupt_info is just a
> > small subset of i915_engine_info, remove it.
> >
> > Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
>
> One comment below.
>
> Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
>
> > +++ b/drivers/gpu/drm/i915/intel_engine_cs.c
> > @@ -1690,6 +1690,11 @@ void intel_engine_dump(struct intel_engine_cs *engine,
> > if (i915_terminally_wedged(&engine->i915->gpu_error))
> > drm_printf(m, "*** WEDGED ***\n");
> >
> > + if (INTEL_GEN(dev_priv) >= 6) {
> > + drm_printf(m, " Interrupt mask: %08x\n",
> > + I915_READ_IMR(engine));
>
> Next printf is not capitalized.
Renamed it to RING_IMR (since we are already RING_foo for the other
registers) and moved it down next to the waitqueue printing.
Thanks for the review, pushed.
-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.BAT: warning for series starting with [1/2] drm/i915: Remove debugfs/i915_seqno_info
2017-12-09 10:44 [PATCH 1/2] drm/i915: Remove debugfs/i915_seqno_info Chris Wilson
2017-12-09 10:44 ` [PATCH 2/2] drm/i915: Stop showing seqno info from debugfs/i915_interrupt_info Chris Wilson
@ 2017-12-09 11:15 ` Patchwork
2017-12-11 9:07 ` [PATCH 1/2] " Joonas Lahtinen
2 siblings, 0 replies; 6+ messages in thread
From: Patchwork @ 2017-12-09 11:15 UTC (permalink / raw)
To: Chris Wilson; +Cc: intel-gfx
== Series Details ==
Series: series starting with [1/2] drm/i915: Remove debugfs/i915_seqno_info
URL : https://patchwork.freedesktop.org/series/35144/
State : warning
== Summary ==
Series 35144v1 series starting with [1/2] drm/i915: Remove debugfs/i915_seqno_info
https://patchwork.freedesktop.org/api/1.0/series/35144/revisions/1/mbox/
Test gem_mmap_gtt:
Subgroup basic-small-bo-tiledx:
pass -> FAIL (fi-gdg-551) fdo#102575
Test kms_pipe_crc_basic:
Subgroup suspend-read-crc-pipe-a:
dmesg-warn -> PASS (fi-kbl-r) fdo#104172
Subgroup suspend-read-crc-pipe-b:
incomplete -> PASS (fi-snb-2520m) fdo#103713
pass -> DMESG-WARN (fi-kbl-r)
fdo#102575 https://bugs.freedesktop.org/show_bug.cgi?id=102575
fdo#104172 https://bugs.freedesktop.org/show_bug.cgi?id=104172
fdo#103713 https://bugs.freedesktop.org/show_bug.cgi?id=103713
fi-bdw-5557u total:288 pass:267 dwarn:0 dfail:0 fail:0 skip:21 time:440s
fi-bdw-gvtdvm total:288 pass:264 dwarn:0 dfail:0 fail:0 skip:24 time:444s
fi-bsw-n3050 total:288 pass:242 dwarn:0 dfail:0 fail:0 skip:46 time:522s
fi-bwr-2160 total:288 pass:183 dwarn:0 dfail:0 fail:0 skip:105 time:280s
fi-bxt-dsi total:288 pass:258 dwarn:0 dfail:0 fail:0 skip:30 time:505s
fi-bxt-j4205 total:288 pass:259 dwarn:0 dfail:0 fail:0 skip:29 time:512s
fi-byt-j1900 total:288 pass:253 dwarn:0 dfail:0 fail:0 skip:35 time:493s
fi-byt-n2820 total:288 pass:249 dwarn:0 dfail:0 fail:0 skip:39 time:483s
fi-elk-e7500 total:224 pass:163 dwarn:15 dfail:0 fail:0 skip:45
fi-gdg-551 total:288 pass:178 dwarn:1 dfail:0 fail:1 skip:108 time:270s
fi-hsw-4770 total:288 pass:261 dwarn:0 dfail:0 fail:0 skip:27 time:371s
fi-hsw-4770r total:288 pass:224 dwarn:0 dfail:0 fail:0 skip:64 time:260s
fi-ilk-650 total:288 pass:228 dwarn:0 dfail:0 fail:0 skip:60 time:394s
fi-ivb-3520m total:288 pass:259 dwarn:0 dfail:0 fail:0 skip:29 time:479s
fi-ivb-3770 total:288 pass:259 dwarn:0 dfail:0 fail:0 skip:29 time:450s
fi-kbl-7500u total:288 pass:263 dwarn:1 dfail:0 fail:0 skip:24 time:489s
fi-kbl-7560u total:288 pass:269 dwarn:0 dfail:0 fail:0 skip:19 time:529s
fi-kbl-7567u total:288 pass:268 dwarn:0 dfail:0 fail:0 skip:20 time:475s
fi-kbl-r total:288 pass:260 dwarn:1 dfail:0 fail:0 skip:27 time:536s
fi-pnv-d510 total:288 pass:222 dwarn:1 dfail:0 fail:0 skip:65 time:595s
fi-skl-6260u total:288 pass:268 dwarn:0 dfail:0 fail:0 skip:20 time:449s
fi-skl-6600u total:288 pass:261 dwarn:0 dfail:0 fail:0 skip:27 time:547s
fi-skl-6700hq total:288 pass:262 dwarn:0 dfail:0 fail:0 skip:26 time:569s
fi-skl-6700k total:288 pass:264 dwarn:0 dfail:0 fail:0 skip:24 time:521s
fi-skl-6770hq total:288 pass:268 dwarn:0 dfail:0 fail:0 skip:20 time:498s
fi-skl-gvtdvm total:288 pass:265 dwarn:0 dfail:0 fail:0 skip:23 time:442s
fi-snb-2520m total:288 pass:249 dwarn:0 dfail:0 fail:0 skip:39 time:553s
fi-snb-2600 total:288 pass:248 dwarn:0 dfail:0 fail:0 skip:40 time:424s
Blacklisted hosts:
fi-cfl-s2 total:288 pass:262 dwarn:0 dfail:0 fail:0 skip:26 time:616s
fi-cnl-y total:288 pass:262 dwarn:0 dfail:0 fail:0 skip:26 time:654s
fi-glk-dsi total:288 pass:182 dwarn:1 dfail:4 fail:0 skip:101 time:376s
fi-blb-e6850 failed to collect. IGT log at Patchwork_7458/fi-blb-e6850/igt.log
fi-glk-1 failed to collect. IGT log at Patchwork_7458/fi-glk-1/igt.log
06dd422e3209a968c420e10504f75fbbe897f06c drm-tip: 2017y-12m-08d-21h-06m-35s UTC integration manifest
a2b4571f4b9f drm/i915: Stop showing seqno info from debugfs/i915_interrupt_info
8255cb165051 drm/i915: Remove debugfs/i915_seqno_info
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_7458/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 1/2] drm/i915: Remove debugfs/i915_seqno_info
2017-12-09 10:44 [PATCH 1/2] drm/i915: Remove debugfs/i915_seqno_info Chris Wilson
2017-12-09 10:44 ` [PATCH 2/2] drm/i915: Stop showing seqno info from debugfs/i915_interrupt_info Chris Wilson
2017-12-09 11:15 ` ✗ Fi.CI.BAT: warning for series starting with [1/2] drm/i915: Remove debugfs/i915_seqno_info Patchwork
@ 2017-12-11 9:07 ` Joonas Lahtinen
2 siblings, 0 replies; 6+ messages in thread
From: Joonas Lahtinen @ 2017-12-11 9:07 UTC (permalink / raw)
To: Chris Wilson, intel-gfx
On Sat, 2017-12-09 at 10:44 +0000, Chris Wilson wrote:
> The per-engine seqno info is now available from
> debugfs/i915_engine_info obsoleting debugfs/i915_seqno_info, so remove it.
>
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Regards, Joonas
--
Joonas Lahtinen
Open Source Technology Center
Intel Corporation
_______________________________________________
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:[~2017-12-11 11:03 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-12-09 10:44 [PATCH 1/2] drm/i915: Remove debugfs/i915_seqno_info Chris Wilson
2017-12-09 10:44 ` [PATCH 2/2] drm/i915: Stop showing seqno info from debugfs/i915_interrupt_info Chris Wilson
2017-12-11 9:08 ` Joonas Lahtinen
2017-12-11 11:03 ` Chris Wilson
2017-12-09 11:15 ` ✗ Fi.CI.BAT: warning for series starting with [1/2] drm/i915: Remove debugfs/i915_seqno_info Patchwork
2017-12-11 9:07 ` [PATCH 1/2] " Joonas Lahtinen
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.