drm/i915: BDW PSR: Remove limitations that aren't valid for BDW.

rodrigovivi · danvet · commit 4c8c7000cc54 · 2014-06-13T17:45:26.000+02:00
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
@@ -1776,6 +1776,10 @@ static bool intel_edp_psr_match_conditions(struct intel_dp *intel_dp)
 		return false;
 	}
 
+	/* Below limitations aren't valid for Broadwell */
+	if (IS_BROADWELL(dev))
+		goto out;
+
 	if (I915_READ(SPRCTL(intel_crtc->pipe)) & SPRITE_ENABLE) {
 		DRM_DEBUG_KMS("PSR condition failed: Sprite is Enabled\n");
 		return false;
@@ -1792,6 +1796,7 @@ static bool intel_edp_psr_match_conditions(struct intel_dp *intel_dp)
 		return false;
 	}
 
+ out:
 	dev_priv->psr.source_ok = true;
 	return true;
 }

Original file line number	Diff line number	Diff line change
`@@ -1776,6 +1776,10 @@ static bool intel_edp_psr_match_conditions(struct intel_dp *intel_dp)`
`1776`	`1776`	`return false;`
`1777`	`1777`	`}`
`1778`	`1778`
	`1779`	`+ /* Below limitations aren't valid for Broadwell */`
	`1780`	`+ if (IS_BROADWELL(dev))`
	`1781`	`+ goto out;`
	`1782`	`+`
`1779`	`1783`	`if (I915_READ(SPRCTL(intel_crtc->pipe)) & SPRITE_ENABLE) {`
`1780`	`1784`	`DRM_DEBUG_KMS("PSR condition failed: Sprite is Enabled\n");`
`1781`	`1785`	`return false;`
`@@ -1792,6 +1796,7 @@ static bool intel_edp_psr_match_conditions(struct intel_dp *intel_dp)`
`1792`	`1796`	`return false;`
`1793`	`1797`	`}`
`1794`	`1798`
	`1799`	`+ out:`
`1795`	`1800`	`dev_priv->psr.source_ok = true;`
`1796`	`1801`	`return true;`
`1797`	`1802`	`}`