drm/i915: Fix psr sink status report.

[sfrench/cifs-2.6.git] / drivers / gpu / drm / i915 / i915_debugfs.c

diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
index b3aefd62355707cdd464b80d1fd7f47cc5923605..59dc0610ea44fb89c72a59ba2b8dcb0738059897 100644 (file)
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -2606,13 +2606,22 @@ static int i915_psr_sink_status_show(struct seq_file *m, void *data)
                "sink internal error",
        };
        struct drm_connector *connector = m->private;
+       struct drm_i915_private *dev_priv = to_i915(connector->dev);
        struct intel_dp *intel_dp =
                enc_to_intel_dp(&intel_attached_encoder(connector)->base);
+       int ret;
+
+       if (!CAN_PSR(dev_priv)) {
+               seq_puts(m, "PSR Unsupported\n");
+               return -ENODEV;
+       }
 
        if (connector->status != connector_status_connected)
                return -ENODEV;
 
-       if (drm_dp_dpcd_readb(&intel_dp->aux, DP_PSR_STATUS, &val) == 1) {
+       ret = drm_dp_dpcd_readb(&intel_dp->aux, DP_PSR_STATUS, &val);
+
+       if (ret == 1) {
                const char *str = "unknown";
 
                val &= DP_PSR_SINK_STATE_MASK;
@@ -2620,7 +2629,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 ret;
        }
 
        return 0;