---

yaml --- r: 218765 b: refs/heads/master c: efd4f63 h: refs/heads/master i: 218763: 6db3ecd v: v3
git-mirror · Sep 24, 2010 · d77ead2 · d77ead2
1 parent 56405c2
commit d77ead2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 47eb1d841790082d2fb4bc7a83c81e0a84a30a9e
+refs/heads/master: efd4f6398dc92b5bf392670df862f42a19f34cf2
diff --git a/trunk/drivers/video/via/accel.c b/trunk/drivers/video/via/accel.c
@@ -283,11 +283,12 @@ static int hw_bitblt_2(void __iomem *engine, u8 op, u32 width, u32 height,
 		writel(tmp, engine + 0x1C);
 	}
 
-	if (op != VIA_BITBLT_COLOR)
+	if (op == VIA_BITBLT_FILL) {
+		writel(fg_color, engine + 0x58);
+	} else if (op == VIA_BITBLT_MONO) {
 		writel(fg_color, engine + 0x4C);
-
-	if (op == VIA_BITBLT_MONO)
 		writel(bg_color, engine + 0x50);
+	}
 
 	if (op == VIA_BITBLT_FILL)
 		ge_cmd |= fill_rop << 24 | 0x00002000 | 0x00000001;