[PATCH 8/8] aaa

[José Roberto de Souza]

---
 drivers/gpu/drm/i915/display/intel_psr.c | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_psr.c b/drivers/gpu/drm/i915/display/intel_psr.c
index d84b9147b7da..2f66acb1a54f 100644
--- a/drivers/gpu/drm/i915/display/intel_psr.c
+++ b/drivers/gpu/drm/i915/display/intel_psr.c
@@ -890,15 +890,23 @@ void intel_psr_get_config(struct intel_encoder *encoder,
 			  struct intel_crtc_state *pipe_config)
 {
 	struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
+	struct intel_digital_port *dig_port = enc_to_dig_port(encoder);
 	struct intel_dp *intel_dp;
 	u32 val;
 
-	drm_info(&dev_priv->drm, "intel_psr_get_config port%c\n", port_name(encoder->port));
+	drm_info(&dev_priv->drm, "intel_psr_get_config port%c type=%i dig_port=%px\n",
+		 port_name(encoder->port), encoder->type, dig_port);
 
-	intel_dp = enc_to_intel_dp(encoder);
+	if (!dig_port)
+		return;
+
+	intel_dp = &dig_port->dp;
+	drm_info(&dev_priv->drm, "\tintel_dp=%px\n", intel_dp);
+	if (!intel_dp)
+		return;
 
-	drm_info(&dev_priv->drm, "\tintel_dp=%px | sink_support=%i source_support=%i\n",
-		 intel_dp, intel_dp->psr.sink_support, intel_dp->psr.source_support);
+	drm_info(&dev_priv->drm, "\tsink_support=%i source_support=%i\n",
+		 intel_dp->psr.sink_support, intel_dp->psr.source_support);
 
 	if (!intel_dp || !CAN_PSR(intel_dp))
 		return;
@@ -917,7 +925,7 @@ void intel_psr_get_config(struct intel_encoder *encoder,
 	pipe_config->has_psr2 = intel_dp->psr.psr2_enabled;
 	pipe_config->infoframes.enable |= intel_hdmi_infoframe_enable(DP_SDP_VSC);
 
-	if (!transcoder_has_psr2(dev_priv, pipe_config->cpu_transcoder))
+	if (!intel_dp->psr.psr2_enabled)
 		goto unlock;
 
 	if (HAS_PSR2_SEL_FETCH(dev_priv)) {
-- 
2.31.1