On Mon, Aug 01, 2016 at 11:18:15PM +0530, Kamble, Sagar A wrote: > Reviewed-by: Sagar Arun Kamble <sagar.a.kamble@xxxxxxxxx > <mailto:sagar.a.kamble@xxxxxxxxx>> You're mailer wreaks havoc with your reviewed-by tags. Pleas fix this. > On 6/27/2016 8:10 PM, akash.goel@xxxxxxxxx wrote: > > From: Akash Goel <akash.goel@xxxxxxxxx> > > > > Updated the i915_drpc_info debugfs with coarse power gating & forcewake > > info for Gen9. > > > > v2: Change all IS_GEN9() by gen >= 9 (Damien) > > > > v3: Rebase > > > > Cc: Damien Lespiau <damien.lespiau@xxxxxxxxx> > > Signed-off-by: Akash Goel <akash.goel@xxxxxxxxx> Queued for -next, thanks for the patch. -Daniel > > --- > > drivers/gpu/drm/i915/i915_debugfs.c | 21 ++++++++++++++++++++- > > drivers/gpu/drm/i915/i915_reg.h | 3 +++ > > 2 files changed, 23 insertions(+), 1 deletion(-) > > > > diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c > > index f664884..5185e02 100644 > > --- a/drivers/gpu/drm/i915/i915_debugfs.c > > +++ b/drivers/gpu/drm/i915/i915_debugfs.c > > @@ -1588,6 +1588,7 @@ static int gen6_drpc_info(struct seq_file *m) > > struct drm_device *dev = node->minor->dev; > > struct drm_i915_private *dev_priv = dev->dev_private; > > u32 rpmodectl1, gt_core_status, rcctl1, rc6vids = 0; > > + u32 gen9_powergate_enable = 0, gen9_powergate_status = 0; > > unsigned forcewake_count; > > int count = 0, ret; > > @@ -1615,6 +1616,10 @@ static int gen6_drpc_info(struct seq_file *m) > > rpmodectl1 = I915_READ(GEN6_RP_CONTROL); > > rcctl1 = I915_READ(GEN6_RC_CONTROL); > > + if (INTEL_INFO(dev)->gen >= 9) { > > + gen9_powergate_enable = I915_READ(GEN9_PG_ENABLE); > > + gen9_powergate_status = I915_READ(GEN9_PWRGT_DOMAIN_STATUS); > > + } > > mutex_unlock(&dev->struct_mutex); > > mutex_lock(&dev_priv->rps.hw_lock); > > sandybridge_pcode_read(dev_priv, GEN6_PCODE_READ_RC6VIDS, &rc6vids); > > @@ -1633,6 +1638,12 @@ static int gen6_drpc_info(struct seq_file *m) > > yesno(rcctl1 & GEN6_RC_CTL_RC1e_ENABLE)); > > seq_printf(m, "RC6 Enabled: %s\n", > > yesno(rcctl1 & GEN6_RC_CTL_RC6_ENABLE)); > > + if (INTEL_INFO(dev)->gen >= 9) { > > + seq_printf(m, "Render Well Gating Enabled: %s\n", > > + yesno(gen9_powergate_enable & GEN9_RENDER_PG_ENABLE)); > > + seq_printf(m, "Media Well Gating Enabled: %s\n", > > + yesno(gen9_powergate_enable & GEN9_MEDIA_PG_ENABLE)); > > + } > > seq_printf(m, "Deep RC6 Enabled: %s\n", > > yesno(rcctl1 & GEN6_RC_CTL_RC6p_ENABLE)); > > seq_printf(m, "Deepest RC6 Enabled: %s\n", > > @@ -1661,6 +1672,14 @@ static int gen6_drpc_info(struct seq_file *m) > > seq_printf(m, "Core Power Down: %s\n", > > yesno(gt_core_status & GEN6_CORE_CPD_STATE_MASK)); > > + if (INTEL_INFO(dev)->gen >= 9) { > > + seq_printf(m, "Render Power Well: %s\n", > > + (gen9_powergate_status & > > + GEN9_PWRGT_RENDER_STATUS_MASK) ? "Up" : "Down"); > > + seq_printf(m, "Media Power Well: %s\n", > > + (gen9_powergate_status & > > + GEN9_PWRGT_MEDIA_STATUS_MASK) ? "Up" : "Down"); > > + } > > /* Not exactly sure what this is */ > > seq_printf(m, "RC6 \"Locked to RPn\" residency since boot: %u\n", > > @@ -1678,7 +1697,7 @@ static int gen6_drpc_info(struct seq_file *m) > > GEN6_DECODE_RC6_VID(((rc6vids >> 8) & 0xff))); > > seq_printf(m, "RC6++ voltage: %dmV\n", > > GEN6_DECODE_RC6_VID(((rc6vids >> 16) & 0xff))); > > - return 0; > > + return i915_forcewake_domains(m, NULL); > > } > > static int i915_drpc_info(struct seq_file *m, void *unused) > > diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h > > index c6bfbf8..1c8d029 100644 > > --- a/drivers/gpu/drm/i915/i915_reg.h > > +++ b/drivers/gpu/drm/i915/i915_reg.h > > @@ -6955,6 +6955,9 @@ enum { > > #define ECOBUS _MMIO(0xa180) > > #define FORCEWAKE_MT_ENABLE (1<<5) > > #define VLV_SPAREG2H _MMIO(0xA194) > > +#define GEN9_PWRGT_DOMAIN_STATUS _MMIO(0xA2A0) > > +#define GEN9_PWRGT_MEDIA_STATUS_MASK (1 << 0) > > +#define GEN9_PWRGT_RENDER_STATUS_MASK (1 << 1) > > #define GTFIFODBG _MMIO(0x120000) > > #define GT_FIFO_SBDEDICATE_FREE_ENTRY_CHV (0x1f << 20) > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@xxxxxxxxxxxxxxxxxxxxx > https://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx
