---

yaml --- r: 293541 b: refs/heads/master c: 8e63678 h: refs/heads/master i: 293539: b1a4bc9 v: v3
git-mirror · Jan 24, 2012 · 8ed6544 · 8ed6544
1 parent 456be0a
commit 8ed6544
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: aca258482ed7c600b5aeed03aa8727d94d8dd07e
+refs/heads/master: 8e636784b6f76653d358d521af9c2a8c246df38b
diff --git a/trunk/drivers/gpu/drm/i915/intel_display.c b/trunk/drivers/gpu/drm/i915/intel_display.c
@@ -936,6 +936,10 @@ void assert_pipe(struct drm_i915_private *dev_priv,
 	u32 val;
 	bool cur_state;
 
+	/* if we need the pipe A quirk it must be always on */
+	if (pipe == PIPE_A && dev_priv->quirks & QUIRK_PIPEA_FORCE)
+		state = true;
+
 	reg = PIPECONF(pipe);
 	val = I915_READ(reg);
 	cur_state = !!(val & PIPECONF_ENABLE);