drm/i915: Fix psr sink status report.
Subsystems (2)
Rodrigo Vivi
maintainerPATCH 1/1 drm/i915: Fix psr sink status report.
First of all don't try to read dpcd if PSR is not even supported.
But also, if read failed return -EIO instead of reporting via a backchannel.
Fixes 5b7b30864d1d ("drm/i915/psr: Split sink status into a separate debugfs node")
Cc Chris Wilson <[email protected]>
Cc Dhinakaran Pandiyan <[email protected]>
Cc José Roberto de Souza <[email protected]>
Signed-off-by Rodrigo Vivi <[email protected]>
--- drivers/gpu/drm/i915/i915_debugfs.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/i915_debugfs.c +7 -1
@@ -2594,6 +2594,7 @@ static const struct file_operations i915_guc_log_relay_fops = {static int i915_psr_sink_status_show (struct seq_file *m,void *data) { +struct drm_i915_private *dev_priv =node_to_i915 (m->private);u8 val;static const char *const sink_status[] = {"inactive" ,
@@ -2609,6 +2610,11 @@ static int i915_psr_sink_status_show(struct seq_file *m, void *data)struct intel_dp *intel_dp =enc_to_intel_dp (&intel_attached_encoder (connector)->base); +if (!CAN_PSR (dev_priv)) { +seq_puts (m,"PSR Unsupported\n" ); +return -ENODEV ; + } +if (connector->status != connector_status_connected)return -ENODEV ;
@@ -2620,7 +2626,7 @@ static int i915_psr_sink_status_show(struct seq_file *m, void *data) str = sink_status[val];seq_printf (m,"Sink PSR status: 0x%x [%s]\n" , val, str); }else { -DRM_ERROR ("dpcd read (at %u) failed\n" ,DP_PSR_STATUS ); +return -EIO ; }return 0 ;
Signature · 6 lines
2.17.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx