From d77ead2a1eb05208ce0bdeed8fbee38bed39ce8c Mon Sep 17 00:00:00 2001 From: Florian Tobias Schandinat Date: Wed, 22 Sep 2010 02:33:52 +0000 Subject: [PATCH] --- yaml --- r: 218765 b: refs/heads/master c: efd4f6398dc92b5bf392670df862f42a19f34cf2 h: refs/heads/master i: 218763: 6db3ecd006e7c89ac71a57e679343bed902a4ab7 v: v3 --- [refs] | 2 +- trunk/drivers/video/via/accel.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 11d2c979cb8f..e518731c316e 100644 --- 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 index e44893ea590d..c2f4e6e166f1 100644 --- 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;