| Message ID | 20181204230032.6352-3-jose.souza@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [1/5] drm/i915/psr: Allow PSR2 to be enabled when debugfs asks | expand |
On Tue, 2018-12-04 at 15:00 -0800, José Roberto de Souza wrote: > PSR2 only trigger interruptions for AUX error, so let's not print > useless information in debugsfs. > Also adding a comment to intel_psr_irq_handler() about that. The code still allows the enabling of interrupt debugging for PSR2. Fix that to reject debugfs writes? > > Cc: Rodrigo Vivi <rodrigo.vivi@intel.com> > Cc: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com> > Signed-off-by: José Roberto de Souza <jose.souza@intel.com> > --- > drivers/gpu/drm/i915/i915_debugfs.c | 2 +- > drivers/gpu/drm/i915/intel_psr.c | 1 + > 2 files changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/i915_debugfs.c > b/drivers/gpu/drm/i915/i915_debugfs.c > index 86303ba02666..505d93b31eb6 100644 > --- a/drivers/gpu/drm/i915/i915_debugfs.c > +++ b/drivers/gpu/drm/i915/i915_debugfs.c > @@ -2760,7 +2760,7 @@ static int i915_edp_psr_status(struct seq_file > *m, void *data) > seq_printf(m, "Performance counter: %u\n", val); > } > > - if (psr->debug & I915_PSR_DEBUG_IRQ) { > + if ((psr->debug & I915_PSR_DEBUG_IRQ) && !psr->psr2_enabled) { > seq_printf(m, "Last attempted entry at: %lld\n", > psr->last_entry_attempt); > seq_printf(m, "Last exit at: %lld\n", psr->last_exit); > diff --git a/drivers/gpu/drm/i915/intel_psr.c > b/drivers/gpu/drm/i915/intel_psr.c > index 15a2121aa64f..85349a57689c 100644 > --- a/drivers/gpu/drm/i915/intel_psr.c > +++ b/drivers/gpu/drm/i915/intel_psr.c > @@ -203,6 +203,7 @@ void intel_psr_irq_handler(struct > drm_i915_private *dev_priv, u32 psr_iir) > mask |= EDP_PSR_ERROR(shift); > } > > + /* PSR2 don't trigger PRE_ENTRY and POST_EXIT > interruptions */ > if (psr_iir & EDP_PSR_PRE_ENTRY(shift)) { > dev_priv->psr.last_entry_attempt = time_ns; > DRM_DEBUG_KMS("[transcoder %s] PSR entry > attempt in 2 vblanks\n",
On Mon, 2018-12-10 at 23:03 -0800, Dhinakaran Pandiyan wrote: > On Tue, 2018-12-04 at 15:00 -0800, José Roberto de Souza wrote: > > PSR2 only trigger interruptions for AUX error, so let's not print > > useless information in debugsfs. > > Also adding a comment to intel_psr_irq_handler() about that. > > The code still allows the enabling of interrupt debugging for PSR2. > Fix > that to reject debugfs writes? Done > > > > Cc: Rodrigo Vivi <rodrigo.vivi@intel.com> > > Cc: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com> > > Signed-off-by: José Roberto de Souza <jose.souza@intel.com> > > --- > > drivers/gpu/drm/i915/i915_debugfs.c | 2 +- > > drivers/gpu/drm/i915/intel_psr.c | 1 + > > 2 files changed, 2 insertions(+), 1 deletion(-) > > > > diff --git a/drivers/gpu/drm/i915/i915_debugfs.c > > b/drivers/gpu/drm/i915/i915_debugfs.c > > index 86303ba02666..505d93b31eb6 100644 > > --- a/drivers/gpu/drm/i915/i915_debugfs.c > > +++ b/drivers/gpu/drm/i915/i915_debugfs.c > > @@ -2760,7 +2760,7 @@ static int i915_edp_psr_status(struct > > seq_file > > *m, void *data) > > seq_printf(m, "Performance counter: %u\n", val); > > } > > > > - if (psr->debug & I915_PSR_DEBUG_IRQ) { > > + if ((psr->debug & I915_PSR_DEBUG_IRQ) && !psr->psr2_enabled) { > > seq_printf(m, "Last attempted entry at: %lld\n", > > psr->last_entry_attempt); > > seq_printf(m, "Last exit at: %lld\n", psr->last_exit); > > diff --git a/drivers/gpu/drm/i915/intel_psr.c > > b/drivers/gpu/drm/i915/intel_psr.c > > index 15a2121aa64f..85349a57689c 100644 > > --- a/drivers/gpu/drm/i915/intel_psr.c > > +++ b/drivers/gpu/drm/i915/intel_psr.c > > @@ -203,6 +203,7 @@ void intel_psr_irq_handler(struct > > drm_i915_private *dev_priv, u32 psr_iir) > > mask |= EDP_PSR_ERROR(shift); > > } > > > > + /* PSR2 don't trigger PRE_ENTRY and POST_EXIT > > interruptions */ > > if (psr_iir & EDP_PSR_PRE_ENTRY(shift)) { > > dev_priv->psr.last_entry_attempt = time_ns; > > DRM_DEBUG_KMS("[transcoder %s] PSR entry > > attempt in 2 vblanks\n",
diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c index 86303ba02666..505d93b31eb6 100644 --- a/drivers/gpu/drm/i915/i915_debugfs.c +++ b/drivers/gpu/drm/i915/i915_debugfs.c @@ -2760,7 +2760,7 @@ static int i915_edp_psr_status(struct seq_file *m, void *data) seq_printf(m, "Performance counter: %u\n", val); } - if (psr->debug & I915_PSR_DEBUG_IRQ) { + if ((psr->debug & I915_PSR_DEBUG_IRQ) && !psr->psr2_enabled) { seq_printf(m, "Last attempted entry at: %lld\n", psr->last_entry_attempt); seq_printf(m, "Last exit at: %lld\n", psr->last_exit); diff --git a/drivers/gpu/drm/i915/intel_psr.c b/drivers/gpu/drm/i915/intel_psr.c index 15a2121aa64f..85349a57689c 100644 --- a/drivers/gpu/drm/i915/intel_psr.c +++ b/drivers/gpu/drm/i915/intel_psr.c @@ -203,6 +203,7 @@ void intel_psr_irq_handler(struct drm_i915_private *dev_priv, u32 psr_iir) mask |= EDP_PSR_ERROR(shift); } + /* PSR2 don't trigger PRE_ENTRY and POST_EXIT interruptions */ if (psr_iir & EDP_PSR_PRE_ENTRY(shift)) { dev_priv->psr.last_entry_attempt = time_ns; DRM_DEBUG_KMS("[transcoder %s] PSR entry attempt in 2 vblanks\n",
PSR2 only trigger interruptions for AUX error, so let's not print useless information in debugsfs. Also adding a comment to intel_psr_irq_handler() about that. Cc: Rodrigo Vivi <rodrigo.vivi@intel.com> Cc: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com> Signed-off-by: José Roberto de Souza <jose.souza@intel.com> --- drivers/gpu/drm/i915/i915_debugfs.c | 2 +- drivers/gpu/drm/i915/intel_psr.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-)