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

rodrigovivi · danvet · commit 34eb7579dce8 · 2014-06-13T17:45:25.000+02:00
Also do not cache aux info. That info could be related to another panel.

Reviewed-by: Vijay Purushothaman &lt;vijay.a.purushothaman@intel.com&gt;
Signed-off-by: Rodrigo Vivi &lt;rodrigo.vivi@intel.com&gt;
Signed-off-by: Daniel Vetter &lt;daniel.vetter@ffwll.ch&gt;
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
@@ -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 dev_priv->psr.sink_support;
+	return intel_dp->psr_dpcd[0] & DP_PSR_IS_SUPPORTED;
 }
 
 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)
 		return;
 	}
 
+	if (!is_edp_psr(intel_dp)) {
+		DRM_DEBUG_KMS("PSR not supported by this panel\n");
+		return;
+	}
+
 	/* Setup PSR once */
 	intel_edp_psr_setup(intel_dp);
 
@@ -1862,9 +1865,6 @@ void intel_edp_psr_update(struct drm_device *dev)
 		if (encoder->type == INTEL_OUTPUT_EDP) {
 			intel_dp = enc_to_intel_dp(&encoder->base);
 
-			if (!is_edp_psr(dev))
-				return;
-
 			if (!intel_edp_psr_match_conditions(intel_dp))
 				intel_edp_psr_disable(intel_dp);
 			else

Original file line number	Diff line number	Diff line change
`@@ -1613,11 +1613,9 @@ static void intel_dp_get_config(struct intel_encoder *encoder,`
`1613`	`1613`	`}`
`1614`	`1614`	`}`
`1615`	`1615`
`1616`		`-static bool is_edp_psr(struct drm_device *dev)`
	`1616`	`+static bool is_edp_psr(struct intel_dp *intel_dp)`
`1617`	`1617`	`{`
`1618`		`- struct drm_i915_private *dev_priv = dev->dev_private;`
`1619`		`-`
`1620`		`- return dev_priv->psr.sink_support;`
	`1618`	`+ return intel_dp->psr_dpcd[0] & DP_PSR_IS_SUPPORTED;`
`1621`	`1619`	`}`
`1622`	`1620`
`1623`	`1621`	`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`	`1819`	`return;`
`1822`	`1820`	`}`
`1823`	`1821`
	`1822`	`+ if (!is_edp_psr(intel_dp)) {`
	`1823`	`+ DRM_DEBUG_KMS("PSR not supported by this panel\n");`
	`1824`	`+ return;`
	`1825`	`+ }`
	`1826`	`+`
`1824`	`1827`	`/* Setup PSR once */`
`1825`	`1828`	`intel_edp_psr_setup(intel_dp);`
`1826`	`1829`
`@@ -1862,9 +1865,6 @@ void intel_edp_psr_update(struct drm_device *dev)`
`1862`	`1865`	`if (encoder->type == INTEL_OUTPUT_EDP) {`
`1863`	`1866`	`intel_dp = enc_to_intel_dp(&encoder->base);`
`1864`	`1867`
`1865`		`- if (!is_edp_psr(dev))`
`1866`		`- return;`
`1867`		`-`
`1868`	`1868`	`if (!intel_edp_psr_match_conditions(intel_dp))`
`1869`	`1869`	`intel_edp_psr_disable(intel_dp);`
`1870`	`1870`	`else`