| Message ID | 1367110769-1306-17-git-send-email-ben@bwidawsk.net (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Sat, Apr 27, 2013 at 05:59:27PM -0700, Ben Widawsky wrote: > From: "Xiang, Haihao" <haihao.xiang@intel.com> > > v2 (Ben): s/hsw/hws > > Signed-off-by: Xiang, Haihao <haihao.xiang@intel.com> > [Order changed, and modified by] > Signed-off-by: Ben Widawsky <ben@bwidawsk.net> > --- > drivers/gpu/drm/i915/i915_debugfs.c | 13 +++++++++++++ > 1 file changed, 13 insertions(+) > > diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c > index a55630a..71fb7aa 100644 > --- a/drivers/gpu/drm/i915/i915_debugfs.c > +++ b/drivers/gpu/drm/i915/i915_debugfs.c > @@ -379,6 +379,17 @@ static int i915_gem_request_info(struct seq_file *m, void *data) > } > count++; > } > + if (!list_empty(&dev_priv->ring[VECS].request_list)) { > + seq_printf(m, "VEBOX requests:\n"); > + list_for_each_entry(gem_request, > + &dev_priv->ring[VECS].request_list, > + list) { > + seq_printf(m, " %d @ %d\n", > + gem_request->seqno, > + (int) (jiffies - gem_request->emitted_jiffies)); > + } > + count++; > + } > mutex_unlock(&dev->struct_mutex); That block doesn't seem necessary as the code above this chuck cycles over all the rings? > > if (count == 0) > @@ -570,6 +581,7 @@ static const char *ring_str(int ring) > case RCS: return "render"; > case VCS: return "bsd"; > case BCS: return "blt"; > + case VECS: return "vebox"; > default: return ""; > } > } > @@ -2099,6 +2111,7 @@ static struct drm_info_list i915_debugfs_list[] = { > {"i915_gem_hws", i915_hws_info, 0, (void *)RCS}, > {"i915_gem_hws_blt", i915_hws_info, 0, (void *)BCS}, > {"i915_gem_hws_bsd", i915_hws_info, 0, (void *)VCS}, > + {"i915_gem_hws_vebox", i915_hws_info, 0, (void *)VECS}, > {"i915_rstdby_delays", i915_rstdby_delays, 0}, > {"i915_cur_delayinfo", i915_cur_delayinfo, 0}, > {"i915_delayfreq_table", i915_delayfreq_table, 0}, > -- > 1.8.2.1 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx
On Tue, May 28, 2013 at 04:06:07PM +0100, Damien Lespiau wrote: > On Sat, Apr 27, 2013 at 05:59:27PM -0700, Ben Widawsky wrote: > > From: "Xiang, Haihao" <haihao.xiang@intel.com> > > > > v2 (Ben): s/hsw/hws > > > > Signed-off-by: Xiang, Haihao <haihao.xiang@intel.com> > > [Order changed, and modified by] > > Signed-off-by: Ben Widawsky <ben@bwidawsk.net> > > --- > > drivers/gpu/drm/i915/i915_debugfs.c | 13 +++++++++++++ > > 1 file changed, 13 insertions(+) > > > > diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c > > index a55630a..71fb7aa 100644 > > --- a/drivers/gpu/drm/i915/i915_debugfs.c > > +++ b/drivers/gpu/drm/i915/i915_debugfs.c > > @@ -379,6 +379,17 @@ static int i915_gem_request_info(struct seq_file *m, void *data) > > } > > count++; > > } > > + if (!list_empty(&dev_priv->ring[VECS].request_list)) { > > + seq_printf(m, "VEBOX requests:\n"); > > + list_for_each_entry(gem_request, > > + &dev_priv->ring[VECS].request_list, > > + list) { > > + seq_printf(m, " %d @ %d\n", > > + gem_request->seqno, > > + (int) (jiffies - gem_request->emitted_jiffies)); > > + } > > + count++; > > + } > > mutex_unlock(&dev->struct_mutex); > > That block doesn't seem necessary as the code above this chuck cycles > over all the rings? Indeed. This is a rebase relic. This hunk is removed. > > > > > if (count == 0) > > @@ -570,6 +581,7 @@ static const char *ring_str(int ring) > > case RCS: return "render"; > > case VCS: return "bsd"; > > case BCS: return "blt"; > > + case VECS: return "vebox"; > > default: return ""; > > } > > } > > @@ -2099,6 +2111,7 @@ static struct drm_info_list i915_debugfs_list[] = { > > {"i915_gem_hws", i915_hws_info, 0, (void *)RCS}, > > {"i915_gem_hws_blt", i915_hws_info, 0, (void *)BCS}, > > {"i915_gem_hws_bsd", i915_hws_info, 0, (void *)VCS}, > > + {"i915_gem_hws_vebox", i915_hws_info, 0, (void *)VECS}, > > {"i915_rstdby_delays", i915_rstdby_delays, 0}, > > {"i915_cur_delayinfo", i915_cur_delayinfo, 0}, > > {"i915_delayfreq_table", i915_delayfreq_table, 0}, > > -- > > 1.8.2.1 > > > > _______________________________________________ > > Intel-gfx mailing list > > Intel-gfx@lists.freedesktop.org > > http://lists.freedesktop.org/mailman/listinfo/intel-gfx
diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c index a55630a..71fb7aa 100644 --- a/drivers/gpu/drm/i915/i915_debugfs.c +++ b/drivers/gpu/drm/i915/i915_debugfs.c @@ -379,6 +379,17 @@ static int i915_gem_request_info(struct seq_file *m, void *data) } count++; } + if (!list_empty(&dev_priv->ring[VECS].request_list)) { + seq_printf(m, "VEBOX requests:\n"); + list_for_each_entry(gem_request, + &dev_priv->ring[VECS].request_list, + list) { + seq_printf(m, " %d @ %d\n", + gem_request->seqno, + (int) (jiffies - gem_request->emitted_jiffies)); + } + count++; + } mutex_unlock(&dev->struct_mutex); if (count == 0) @@ -570,6 +581,7 @@ static const char *ring_str(int ring) case RCS: return "render"; case VCS: return "bsd"; case BCS: return "blt"; + case VECS: return "vebox"; default: return ""; } } @@ -2099,6 +2111,7 @@ static struct drm_info_list i915_debugfs_list[] = { {"i915_gem_hws", i915_hws_info, 0, (void *)RCS}, {"i915_gem_hws_blt", i915_hws_info, 0, (void *)BCS}, {"i915_gem_hws_bsd", i915_hws_info, 0, (void *)VCS}, + {"i915_gem_hws_vebox", i915_hws_info, 0, (void *)VECS}, {"i915_rstdby_delays", i915_rstdby_delays, 0}, {"i915_cur_delayinfo", i915_cur_delayinfo, 0}, {"i915_delayfreq_table", i915_delayfreq_table, 0},