| Message ID | 1421400882-3176-9-git-send-email-mika.kuoppala@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Tested-By: PRC QA PRTS (Patch Regression Test System Contact: shuang.he@intel.com)
Task id: 5592
-------------------------------------Summary-------------------------------------
Platform Delta drm-intel-nightly Series Applied
PNV -1 353/353 352/353
ILK 200/200 200/200
SNB 400/422 400/422
IVB 487/487 487/487
BYT 296/296 296/296
HSW -1 487/508 486/508
BDW -2 401/402 399/402
-------------------------------------Detailed-------------------------------------
Platform Test drm-intel-nightly Series Applied
*PNV igt_gem_fence_thrash_bo-write-verify-threaded-none PASS(2, M25M7) CRASH(1, M7)
HSW igt_kms_flip_event_leak NSPT(4, M19)PASS(1, M19) NSPT(1, M19)
*BDW igt_gem_pwrite_pread_display-pwrite-blt-gtt_mmap-performance PASS(2, M30M28) DMESG_WARN(1, M28)
*BDW igt_gem_pwrite_pread_uncached-pwrite-blt-gtt_mmap-performance PASS(2, M30M28) DMESG_WARN(1, M28)
Note: You need to pay more attention to line start with '*'
On Fri, Jan 16, 2015 at 11:34:42AM +0200, Mika Kuoppala wrote: > From: Mika Kuoppala <mika.kuoppala@linux.intel.com> > > There are multiple forcewake domains in newer architectures. > Rename 'i915_gen6_forcewake_count_info' debugfs entry to > 'i915_forcewake_domains' to reflect this. > > Signed-off-by: Mika Kuoppala <mika.kuoppala@intel.com> Entire series merged, thanks. -Daniel > --- > drivers/gpu/drm/i915/i915_debugfs.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c > index c9dbf58..269425b 100644 > --- a/drivers/gpu/drm/i915/i915_debugfs.c > +++ b/drivers/gpu/drm/i915/i915_debugfs.c > @@ -1288,7 +1288,7 @@ static int ironlake_drpc_info(struct seq_file *m) > return 0; > } > > -static int i915_gen6_forcewake_count_info(struct seq_file *m, void *data) > +static int i915_forcewake_domains(struct seq_file *m, void *data) > { > struct drm_info_node *node = m->private; > struct drm_device *dev = node->minor->dev; > @@ -1344,7 +1344,7 @@ static int vlv_drpc_info(struct seq_file *m) > seq_printf(m, "Media RC6 residency since boot: %u\n", > I915_READ(VLV_GT_MEDIA_RC6)); > > - return i915_gen6_forcewake_count_info(m, NULL); > + return i915_forcewake_domains(m, NULL); > } > > static int gen6_drpc_info(struct seq_file *m) > @@ -4406,7 +4406,7 @@ static const struct drm_info_list i915_debugfs_list[] = { > {"i915_context_status", i915_context_status, 0}, > {"i915_dump_lrc", i915_dump_lrc, 0}, > {"i915_execlists", i915_execlists, 0}, > - {"i915_gen6_forcewake_count", i915_gen6_forcewake_count_info, 0}, > + {"i915_forcewake_domains", i915_forcewake_domains, 0}, > {"i915_swizzle_info", i915_swizzle_info, 0}, > {"i915_ppgtt_info", i915_ppgtt_info, 0}, > {"i915_llc", i915_llc, 0}, > -- > 1.9.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 c9dbf58..269425b 100644 --- a/drivers/gpu/drm/i915/i915_debugfs.c +++ b/drivers/gpu/drm/i915/i915_debugfs.c @@ -1288,7 +1288,7 @@ static int ironlake_drpc_info(struct seq_file *m) return 0; } -static int i915_gen6_forcewake_count_info(struct seq_file *m, void *data) +static int i915_forcewake_domains(struct seq_file *m, void *data) { struct drm_info_node *node = m->private; struct drm_device *dev = node->minor->dev; @@ -1344,7 +1344,7 @@ static int vlv_drpc_info(struct seq_file *m) seq_printf(m, "Media RC6 residency since boot: %u\n", I915_READ(VLV_GT_MEDIA_RC6)); - return i915_gen6_forcewake_count_info(m, NULL); + return i915_forcewake_domains(m, NULL); } static int gen6_drpc_info(struct seq_file *m) @@ -4406,7 +4406,7 @@ static const struct drm_info_list i915_debugfs_list[] = { {"i915_context_status", i915_context_status, 0}, {"i915_dump_lrc", i915_dump_lrc, 0}, {"i915_execlists", i915_execlists, 0}, - {"i915_gen6_forcewake_count", i915_gen6_forcewake_count_info, 0}, + {"i915_forcewake_domains", i915_forcewake_domains, 0}, {"i915_swizzle_info", i915_swizzle_info, 0}, {"i915_ppgtt_info", i915_ppgtt_info, 0}, {"i915_llc", i915_llc, 0},