提交 34eb7579 编写于 作者: R Rodrigo Vivi 提交者: Daniel Vetter

drm/i915: Do not try to enable PSR when Panel doesn't suport it.

Also do not cache aux info. That info could be related to another panel.
Reviewed-by: NVijay Purushothaman <vijay.a.purushothaman@intel.com>
Signed-off-by: NRodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: NDaniel Vetter <daniel.vetter@ffwll.ch>
上级 16487254
...@@ -1613,11 +1613,9 @@ static void intel_dp_get_config(struct intel_encoder *encoder, ...@@ -1613,11 +1613,9 @@ static void intel_dp_get_config(struct intel_encoder *encoder,
} }
} }
static bool is_edp_psr(struct drm_device *dev) static bool is_edp_psr(struct intel_dp *intel_dp)
{ {
struct drm_i915_private *dev_priv = dev->dev_private; return intel_dp->psr_dpcd[0] & DP_PSR_IS_SUPPORTED;
return dev_priv->psr.sink_support;
} }
static bool intel_edp_is_psr_enabled(struct drm_device *dev) static bool intel_edp_is_psr_enabled(struct drm_device *dev)
...@@ -1821,6 +1819,11 @@ void intel_edp_psr_enable(struct intel_dp *intel_dp) ...@@ -1821,6 +1819,11 @@ void intel_edp_psr_enable(struct intel_dp *intel_dp)
return; return;
} }
if (!is_edp_psr(intel_dp)) {
DRM_DEBUG_KMS("PSR not supported by this panel\n");
return;
}
/* Setup PSR once */ /* Setup PSR once */
intel_edp_psr_setup(intel_dp); intel_edp_psr_setup(intel_dp);
...@@ -1862,9 +1865,6 @@ void intel_edp_psr_update(struct drm_device *dev) ...@@ -1862,9 +1865,6 @@ void intel_edp_psr_update(struct drm_device *dev)
if (encoder->type == INTEL_OUTPUT_EDP) { if (encoder->type == INTEL_OUTPUT_EDP) {
intel_dp = enc_to_intel_dp(&encoder->base); intel_dp = enc_to_intel_dp(&encoder->base);
if (!is_edp_psr(dev))
return;
if (!intel_edp_psr_match_conditions(intel_dp)) if (!intel_edp_psr_match_conditions(intel_dp))
intel_edp_psr_disable(intel_dp); intel_edp_psr_disable(intel_dp);
else else
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册