[PATCH 2/2] debug

[José Roberto de Souza]

---
 drivers/gpu/drm/i915/display/intel_bios.c    | 3 +++
 drivers/gpu/drm/i915/display/intel_display.c | 2 ++
 drivers/gpu/drm/i915/display/intel_psr.c     | 7 +++----
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_bios.c b/drivers/gpu/drm/i915/display/intel_bios.c
index 2049cf5b54f3..8f5f62ba1382 100644
--- a/drivers/gpu/drm/i915/display/intel_bios.c
+++ b/drivers/gpu/drm/i915/display/intel_bios.c
@@ -2109,6 +2109,9 @@ void intel_bios_init(struct drm_i915_private *dev_priv)
 
 	init_vbt_defaults(dev_priv);
 
+	vbt = NULL;
+	goto out;
+
 	/* If the OpRegion does not have VBT, look in PCI ROM. */
 	if (!vbt) {
 		oprom_vbt = oprom_get_vbt(dev_priv);
diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index df616afd533a..434f12eb0443 100644
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -17737,6 +17737,7 @@ static void sanitize_watermarks(struct drm_i915_private *dev_priv)
 		goto fail;
 
 	ret = intel_atomic_check(&dev_priv->drm, state);
+	DRM_DEBUG_KMS("sanitize_watermarks() ret=%i\n", ret);
 	if (ret)
 		goto fail;
 
@@ -17831,6 +17832,7 @@ static int intel_initial_commit(struct drm_device *dev)
 	}
 
 	ret = drm_atomic_commit(state);
+	DRM_DEBUG_KMS("intel_initial_commit() ret=%i\n", ret);
 
 out:
 	if (ret == -EDEADLK) {
diff --git a/drivers/gpu/drm/i915/display/intel_psr.c b/drivers/gpu/drm/i915/display/intel_psr.c
index db3d1561e9bf..063f188649ac 100644
--- a/drivers/gpu/drm/i915/display/intel_psr.c
+++ b/drivers/gpu/drm/i915/display/intel_psr.c
@@ -1431,10 +1431,7 @@ void intel_psr_flush(struct drm_i915_private *dev_priv,
  */
 void intel_psr_init(struct drm_i915_private *dev_priv)
 {
-	if (!HAS_PSR(dev_priv))
-		return;
-
-	if (!dev_priv->psr.sink_support)
+	if (!CAN_PSR(dev_priv))
 		return;
 
 	if (IS_HASWELL(dev_priv))
@@ -1614,6 +1611,7 @@ void intel_psr_atomic_check(struct drm_connector *connector,
 
 	if (!CAN_PSR(dev_priv) || !new_state->crtc ||
 	    dev_priv->psr.initially_probed)
+	    //dev_priv->psr.initially_probed || !i915_modparams.enable_psr)
 		return;
 
 	intel_connector = to_intel_connector(connector);
@@ -1623,6 +1621,7 @@ void intel_psr_atomic_check(struct drm_connector *connector,
 
 	crtc_state = drm_atomic_get_new_crtc_state(new_state->state,
 						   new_state->crtc);
+	DRM_DEBUG_KMS("intel_psr_atomic_check mod_changed=true\n");
 	crtc_state->mode_changed = true;
 	dev_priv->psr.initially_probed = true;
 }
-- 
2.25.0