drm/i915: Simplify PSR debugfs

for igt test case.

v2: remove trailing spaces and fix conflicts

Signed-off-by: Rodrigo Vivi <rodrigo.vivi@gmail.com>
[danvet:
- make it comipile
- s/IS_HASWELL/HAS_PSR/]
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

1 files changed, 11 insertions, 118 deletions

diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
index bc5c04d5890f..61fd61969e21 100644
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -1666,127 +1666,20 @@ static int i915_edp_psr_status(struct seq_file *m, void *data)
         struct drm_info_node *node = m->private;
         struct drm_device *dev = node->minor->dev;
         struct drm_i915_private *dev_priv = dev->dev_private;
-        u32 psrstat, psrperf;
+        u32 psrperf = 0;
+        bool enabled = false;
 
-        if (!HAS_PSR(dev)) {
-                seq_puts(m, "PSR not supported on this platform\n");
-        } else if (HAS_PSR(dev) &&
-                   I915_READ(EDP_PSR_CTL(dev)) & EDP_PSR_ENABLE) {
-                seq_puts(m, "PSR enabled\n");
-        } else {
-                seq_puts(m, "PSR disabled: ");
-                switch (dev_priv->no_psr_reason) {
-                case PSR_NO_SOURCE:
-                        seq_puts(m, "not supported on this platform");
-                        break;
-                case PSR_NO_SINK:
-                        seq_puts(m, "not supported by panel");
-                        break;
-                case PSR_MODULE_PARAM:
-                        seq_puts(m, "disabled by flag");
-                        break;
-                case PSR_CRTC_NOT_ACTIVE:
-                        seq_puts(m, "crtc not active");
-                        break;
-                case PSR_PWR_WELL_ENABLED:
-                        seq_puts(m, "power well enabled");
-                        break;
-                case PSR_NOT_TILED:
-                        seq_puts(m, "not tiled");
-                        break;
-                case PSR_SPRITE_ENABLED:
-                        seq_puts(m, "sprite enabled");
-                        break;
-                case PSR_S3D_ENABLED:
-                        seq_puts(m, "stereo 3d enabled");
-                        break;
-                case PSR_INTERLACED_ENABLED:
-                        seq_puts(m, "interlaced enabled");
-                        break;
-                case PSR_HSW_NOT_DDIA:
-                        seq_puts(m, "HSW ties PSR to DDI A (eDP)");
-                        break;
-                default:
-                        seq_puts(m, "unknown reason");
-                }
-                seq_puts(m, "\n");
-                return 0;
-        }
-
-        psrstat = I915_READ(EDP_PSR_STATUS_CTL(dev));
-
-        seq_puts(m, "PSR Current State: ");
-        switch (psrstat & EDP_PSR_STATUS_STATE_MASK) {
-        case EDP_PSR_STATUS_STATE_IDLE:
-                seq_puts(m, "Reset state\n");
-                break;
-        case EDP_PSR_STATUS_STATE_SRDONACK:
-                seq_puts(m, "Wait for TG/Stream to send on frame of data after SRD conditions are met\n");
-                break;
-        case EDP_PSR_STATUS_STATE_SRDENT:
-                seq_puts(m, "SRD entry\n");
-                break;
-        case EDP_PSR_STATUS_STATE_BUFOFF:
-                seq_puts(m, "Wait for buffer turn off\n");
-                break;
-        case EDP_PSR_STATUS_STATE_BUFON:
-                seq_puts(m, "Wait for buffer turn on\n");
-                break;
-        case EDP_PSR_STATUS_STATE_AUXACK:
-                seq_puts(m, "Wait for AUX to acknowledge on SRD exit\n");
-                break;
-        case EDP_PSR_STATUS_STATE_SRDOFFACK:
-                seq_puts(m, "Wait for TG/Stream to acknowledge the SRD VDM exit\n");
-                break;
-        default:
-                seq_puts(m, "Unknown\n");
-                break;
-        }
-
-        seq_puts(m, "Link Status: ");
-        switch (psrstat & EDP_PSR_STATUS_LINK_MASK) {
-        case EDP_PSR_STATUS_LINK_FULL_OFF:
-                seq_puts(m, "Link is fully off\n");
-                break;
-        case EDP_PSR_STATUS_LINK_FULL_ON:
-                seq_puts(m, "Link is fully on\n");
-                break;
-        case EDP_PSR_STATUS_LINK_STANDBY:
-                seq_puts(m, "Link is in standby\n");
-                break;
-        default:
-                seq_puts(m, "Unknown\n");
-                break;
-        }
-
-        seq_printf(m, "PSR Entry Count: %u\n",
-                   psrstat >> EDP_PSR_STATUS_COUNT_SHIFT &
-                   EDP_PSR_STATUS_COUNT_MASK);
-
-        seq_printf(m, "Max Sleep Timer Counter: %u\n",
-                   psrstat >> EDP_PSR_STATUS_MAX_SLEEP_TIMER_SHIFT &
-                   EDP_PSR_STATUS_MAX_SLEEP_TIMER_MASK);
-
-        seq_printf(m, "Had AUX error: %s\n",
-                   yesno(psrstat & EDP_PSR_STATUS_AUX_ERROR));
-
-        seq_printf(m, "Sending AUX: %s\n",
-                   yesno(psrstat & EDP_PSR_STATUS_AUX_SENDING));
-
-        seq_printf(m, "Sending Idle: %s\n",
-                   yesno(psrstat & EDP_PSR_STATUS_SENDING_IDLE));
-
-        seq_printf(m, "Sending TP2 TP3: %s\n",
-                   yesno(psrstat & EDP_PSR_STATUS_SENDING_TP2_TP3));
-
-        seq_printf(m, "Sending TP1: %s\n",
-                   yesno(psrstat & EDP_PSR_STATUS_SENDING_TP1));
+        seq_printf(m, "Sink_Support: %s\n", yesno(dev_priv->psr.sink_support));
+        seq_printf(m, "Source_OK: %s\n", yesno(dev_priv->psr.source_ok));
 
-        seq_printf(m, "Idle Count: %u\n",
-                   psrstat & EDP_PSR_STATUS_IDLE_MASK);
+        enabled = HAS_PSR(dev) &&
+                I915_READ(EDP_PSR_CTL(dev)) & EDP_PSR_ENABLE;
+        seq_printf(m, "Enabled: %s\n", yesno(enabled));
 
-        psrperf = (I915_READ(EDP_PSR_PERF_CNT(dev))) & EDP_PSR_PERF_CNT_MASK;
-        seq_printf(m, "Performance Counter: %u\n", psrperf);
+        if (HAS_PSR(dev))
+                psrperf = I915_READ(EDP_PSR_PERF_CNT(dev)) &
+                        EDP_PSR_PERF_CNT_MASK;
+        seq_printf(m, "Performance_Counter: %u\n", psrperf);
 
         return 0;
 }