<div dir="ltr">merged to dinq, thanks for the patch.</div> <div class="gmail_quote"><div dir="ltr">On Fri, Dec 9, 2016 at 4:39 PM Rodrigo Vivi <<a href="mailto:rodrigo.vivi@gmail.com">rodrigo.vivi@gmail.com</a>> wrote: </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"> Reviewed-by: Rodrigo Vivi <<a href="mailto:rodrigo.vivi@intel.com" class="gmail_msg" target="_blank">rodrigo.vivi@intel.com</a>> On Fri, Dec 09, 2016 at 11:42:09PM +0530, vathsala nagaraju wrote: > For PSR2 , as per spec, PSR2_CTL bit 31 to be set. > for psr1, bit 31 in SRD_CTL to be set. Reporting > "HW Enabled & Active bit" status for psr2 from SRD_CTL > gives wrong status. > > Cc: Rodrigo Vivi <<a href="mailto:rodrigo.vivi@intel.com" class="gmail_msg" target="_blank">rodrigo.vivi@intel.com</a>> > Cc: Jim Bride <<a href="mailto:jim.bride@linux.intel.com" class="gmail_msg" target="_blank">jim.bride@linux.intel.com</a>> > Signed-off-by: vathsala nagaraju <<a href="mailto:vathsala.nagaraju@intel.com" class="gmail_msg" target="_blank">vathsala.nagaraju@intel.com</a>> > --- > drivers/gpu/drm/i915/i915_debugfs.c | 9 ++++++--- > 1 file changed, 6 insertions(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c > index a746130..54e196d 100644 > --- a/drivers/gpu/drm/i915/i915_debugfs.c > +++ b/drivers/gpu/drm/i915/i915_debugfs.c > @@ -2567,9 +2567,12 @@ static int i915_edp_psr_status(struct seq_file *m, void *data) > seq_printf(m, "Re-enable work scheduled: %s\n", > yesno(work_busy(&dev_priv->psr.work.work))); > > - if (HAS_DDI(dev_priv)) > - enabled = I915_READ(EDP_PSR_CTL) & EDP_PSR_ENABLE; > - else { > + if (HAS_DDI(dev_priv)) { > + if (dev_priv->psr.psr2_support) > + enabled = I915_READ(EDP_PSR2_CTL) & EDP_PSR2_ENABLE; > + else > + enabled = I915_READ(EDP_PSR_CTL) & EDP_PSR_ENABLE; > + } else { > for_each_pipe(dev_priv, pipe) { > enum transcoder cpu_transcoder = > intel_pipe_to_cpu_transcoder(dev_priv, pipe); > -- > 1.9.1 > > _______________________________________________ > Intel-gfx mailing list > <a href="mailto:Intel-gfx@lists.freedesktop.org" class="gmail_msg" target="_blank">Intel-gfx@lists.freedesktop.org</a> > <a href="https://lists.freedesktop.org/mailman/listinfo/intel-gfx" rel="noreferrer" class="gmail_msg" target="_blank">https://lists.freedesktop.org/mailman/listinfo/intel-gfx</a> </blockquote></div>