浏览代码

drm/i915: don't check plane vs pipe enable on ILK+

These bits have a different meaning on ILK+, where planes are hardwired
to pipes.  Fixing this avoid some spurious assertion failures.

Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Jesse Barnes 14 年之前
父节点
当前提交
19ec135838
共有 1 个文件被更改,包括 4 次插入0 次删除
  1. 4 0
      drivers/gpu/drm/i915/intel_display.c

+ 4 - 0
drivers/gpu/drm/i915/intel_display.c

@@ -1225,6 +1225,10 @@ static void assert_planes_disabled(struct drm_i915_private *dev_priv,
 	u32 val;
 	u32 val;
 	int cur_pipe;
 	int cur_pipe;
 
 
+	/* Planes are fixed to pipes on ILK+ */
+	if (HAS_PCH_SPLIT(dev_priv->dev))
+		return;
+
 	/* Need to check both planes against the pipe */
 	/* Need to check both planes against the pipe */
 	for (i = 0; i < 2; i++) {
 	for (i = 0; i < 2; i++) {
 		reg = DSPCNTR(i);
 		reg = DSPCNTR(i);