[PATCH 6/8] drm/i915: Aaaaaa

José Roberto de Souza jose.souza at intel.com
Sat Apr 17 21:49:00 UTC 2021


Bbbbb sdsfd

Signed-off-by: José Roberto de Souza <jose.souza at intel.com>
---
 drivers/gpu/drm/i915/display/intel_psr.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/display/intel_psr.c b/drivers/gpu/drm/i915/display/intel_psr.c
index f3089f4ace2c..2304786132cf 100644
--- a/drivers/gpu/drm/i915/display/intel_psr.c
+++ b/drivers/gpu/drm/i915/display/intel_psr.c
@@ -893,7 +893,7 @@ void intel_psr_get_config(struct intel_encoder *encoder,
 	struct intel_dp *intel_dp = enc_to_intel_dp(encoder);
 	u32 val;
 
-	if (!intel_dp || !intel_dp->psr.source_support)
+	if (!intel_dp || !CAN_PSR(intel_dp))
 		return;
 
 	mutex_lock(&intel_dp->psr.lock);
@@ -910,6 +910,9 @@ 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))
+		goto unlock;
+
 	if (HAS_PSR2_SEL_FETCH(dev_priv)) {
 		val = intel_de_read(dev_priv, PSR2_MAN_TRK_CTL(intel_dp->psr.transcoder));
 		if (val & PSR2_MAN_TRK_CTL_ENABLE)
@@ -922,6 +925,7 @@ void intel_psr_get_config(struct intel_encoder *encoder,
 		pipe_config->dc3co_exitline = val;
 	}
 
+unlock:
 	mutex_unlock(&intel_dp->psr.lock);
 }
 
-- 
2.31.1



More information about the Intel-gfx-trybot mailing list