[PATCH 13/13] Revert "debug"

[José Roberto de Souza]

This reverts commit 45b2626b83f51e3c9cfe7551785323fc2f93a918.
---
 drivers/gpu/drm/i915/intel_pipe_crc.c | 10 ---------
 drivers/gpu/drm/i915/intel_psr.c      | 31 +++++----------------------
 2 files changed, 5 insertions(+), 36 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_pipe_crc.c b/drivers/gpu/drm/i915/intel_pipe_crc.c
index 98fc4ca549f7..e04a232eba64 100644
--- a/drivers/gpu/drm/i915/intel_pipe_crc.c
+++ b/drivers/gpu/drm/i915/intel_pipe_crc.c
@@ -600,7 +600,6 @@ int intel_crtc_set_crc_source(struct drm_crtc *crtc, const char *source_name)
 	intel_wakeref_t wakeref;
 	u32 val = 0; /* shut up gcc */
 	int ret = 0;
-	struct intel_crtc *intel_crtc;
 
 	if (display_crc_ctl_parse_source(source_name, &source) < 0) {
 		DRM_DEBUG_DRIVER("unknown source %s\n", source_name);
@@ -618,13 +617,8 @@ int intel_crtc_set_crc_source(struct drm_crtc *crtc, const char *source_name)
 	if (ret != 0)
 		goto out;
 
-	intel_crtc = to_intel_crtc(crtc);
-	DRM_DEBUG_KMS("intel_crtc_set_crc_source() pipe=%c before\n", pipe_name(intel_crtc->pipe));
-
 	intel_crtc_crc_prepare_or_finish(crtc, source != INTEL_PIPE_CRC_SOURCE_NONE);
 
-	DRM_DEBUG_KMS("intel_crtc_set_crc_source() pipe=%c after\n", pipe_name(intel_crtc->pipe));
-
 	pipe_crc->source = source;
 	I915_WRITE(PIPE_CRC_CTL(crtc->index), val);
 	POSTING_READ(PIPE_CRC_CTL(crtc->index));
@@ -663,8 +657,6 @@ void intel_crtc_enable_pipe_crc(struct intel_crtc *intel_crtc)
 	/* Don't need pipe_crc->lock here, IRQs are not generated. */
 	pipe_crc->skipped = 0;
 
-	DRM_DEBUG_KMS("intel_crtc_enable_pipe_crc() pipe=%c\n", pipe_name(intel_crtc->pipe));
-
 	I915_WRITE(PIPE_CRC_CTL(crtc->index), val);
 	POSTING_READ(PIPE_CRC_CTL(crtc->index));
 }
@@ -680,8 +672,6 @@ void intel_crtc_disable_pipe_crc(struct intel_crtc *intel_crtc)
 	pipe_crc->skipped = INT_MIN;
 	spin_unlock_irq(&pipe_crc->lock);
 
-	DRM_DEBUG_KMS("intel_crtc_disable_pipe_crc() pipe=%c\n", pipe_name(intel_crtc->pipe));
-
 	I915_WRITE(PIPE_CRC_CTL(crtc->index), 0);
 	POSTING_READ(PIPE_CRC_CTL(crtc->index));
 	synchronize_irq(dev_priv->drm.irq);
diff --git a/drivers/gpu/drm/i915/intel_psr.c b/drivers/gpu/drm/i915/intel_psr.c
index d1ba04b18dc5..b1987ac68791 100644
--- a/drivers/gpu/drm/i915/intel_psr.c
+++ b/drivers/gpu/drm/i915/intel_psr.c
@@ -583,11 +583,6 @@ void intel_psr_compute_config(struct intel_dp *intel_dp,
 	const struct drm_display_mode *adjusted_mode =
 		&crtc_state->base.adjusted_mode;
 	int psr_setup_time;
-	struct intel_crtc *intel_crtc;
-
-	intel_crtc = to_intel_crtc(crtc_state->base.crtc);
-
-	DRM_DEBUG_KMS("intel_psr_compute_config() pipe%c\n", intel_crtc->pipe);
 
 	if (!CAN_PSR(dev_priv))
 		return;
@@ -725,8 +720,8 @@ static void intel_psr_enable_locked(struct drm_i915_private *dev_priv,
 	dev_priv->psr.busy_frontbuffer_bits = 0;
 	dev_priv->psr.pipe = to_intel_crtc(crtc_state->base.crtc)->pipe;
 
-	DRM_DEBUG_KMS("Enabling PSR%s pipe%c\n",
-		      dev_priv->psr.psr2_enabled ? "2" : "1", pipe_name(dev_priv->psr.pipe));
+	DRM_DEBUG_KMS("Enabling PSR%s\n",
+		      dev_priv->psr.psr2_enabled ? "2" : "1");
 	intel_psr_setup_vsc(intel_dp, crtc_state);
 	intel_psr_enable_sink(intel_dp);
 	intel_psr_enable_source(intel_dp, crtc_state);
@@ -802,8 +797,8 @@ static void intel_psr_disable_locked(struct intel_dp *intel_dp)
 	if (!dev_priv->psr.enabled)
 		return;
 
-	DRM_DEBUG_KMS("Disabling PSR%s pipe%c\n",
-		      dev_priv->psr.psr2_enabled ? "2" : "1", pipe_name(dev_priv->psr.pipe));
+	DRM_DEBUG_KMS("Disabling PSR%s\n",
+		      dev_priv->psr.psr2_enabled ? "2" : "1");
 
 	intel_psr_exit(dev_priv);
 
@@ -965,8 +960,6 @@ static int intel_psr_fastset_force(struct drm_i915_private *dev_priv)
 	struct drm_crtc *crtc;
 	int err;
 
-	DRM_DEBUG_KMS("intel_psr_fastset_force()\n");
-
 	state = drm_atomic_state_alloc(dev);
 	if (!state)
 		return -ENOMEM;
@@ -978,7 +971,6 @@ static int intel_psr_fastset_force(struct drm_i915_private *dev_priv)
 	drm_for_each_crtc(crtc, dev) {
 		struct drm_crtc_state *crtc_state;
 		struct intel_crtc_state *intel_crtc_state;
-		struct intel_crtc *intel_crtc;
 
 		crtc_state = drm_atomic_get_crtc_state(state, crtc);
 		if (IS_ERR(crtc_state)) {
@@ -987,19 +979,12 @@ static int intel_psr_fastset_force(struct drm_i915_private *dev_priv)
 		}
 
 		intel_crtc_state = to_intel_crtc_state(crtc_state);
-		intel_crtc = to_intel_crtc(crtc);
-
-		DRM_DEBUG_KMS("\tpipe=%c\n", pipe_name(intel_crtc->pipe));
-		DRM_DEBUG_KMS("\tintel_crtc_has_type(intel_crtc_state, INTEL_OUTPUT_EDP)=%d\n", intel_crtc_has_type(intel_crtc_state, INTEL_OUTPUT_EDP));
-		DRM_DEBUG_KMS("\tintel_crtc_state->has_psr=%d\n", intel_crtc_state->has_psr);
-		DRM_DEBUG_KMS("\tenable=%d\n", crtc_state->enable);
 
 		if (crtc_state->enable &&
 		    intel_crtc_has_type(intel_crtc_state, INTEL_OUTPUT_EDP) &&
 		    intel_crtc_state->has_psr) {
 			/* Mark mode as changed to trigger a pipe->update() */
 			crtc_state->mode_changed = true;
-			DRM_DEBUG_KMS("\tcrtc_state->mode_changed = true\n");
 			break;
 		}
 	}
@@ -1010,18 +995,14 @@ static int intel_psr_fastset_force(struct drm_i915_private *dev_priv)
 	if (err == -EDEADLK) {
 		drm_atomic_state_clear(state);
 		err = drm_modeset_backoff(&ctx);
-		if (!err) {
-			DRM_DEBUG_KMS("\tbacking off\n");
+		if (!err)
 			goto retry;
-		}
 	}
 
 	drm_modeset_drop_locks(&ctx);
 	drm_modeset_acquire_fini(&ctx);
 	drm_atomic_state_put(state);
 
-	DRM_DEBUG_KMS("\treturn err=%i\n", err);
-
 	return err;
 }
 
@@ -1313,8 +1294,6 @@ void intel_psr_crc_prepare_or_finish(struct drm_i915_private *dev_priv, enum pip
 
 	mutex_lock(&dev_priv->psr.lock);
 
-	DRM_DEBUG_KMS("intel_psr_crc_prepare_or_finish() prepare=%d psr.pipe%c pipe%c dev_priv->psr.psr2_enabled=%d", prepare, pipe_name(dev_priv->psr.pipe), pipe_name(pipe), dev_priv->psr.psr2_enabled);
-
 	if (dev_priv->psr.pipe == pipe) {
 		dev_priv->psr.pipe_crc_enabled = prepare;
 		fastset = !prepare || dev_priv->psr.psr2_enabled;
-- 
2.20.1