From c1930fc590ed51265179ad7e53dd39f8e92ae9b6 Mon Sep 17 00:00:00 2001 From: Erik-Jan Post Date: Fri, 15 Jan 2010 17:01:06 -0800 Subject: [PATCH] --- yaml --- r: 179339 b: refs/heads/master c: 97922b5462fa543484831d42ab0fe4562b9373fc h: refs/heads/master i: 179337: 7ef1470703f056a5c0f19e5453cbd2f2b1b1d564 179335: 3c4e05f5eecdfbe36797e8c03e34af6eb186d291 v: v3 --- [refs] | 2 +- trunk/drivers/video/via/accel.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index f0832e3e4c67..8045512e1259 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8a3a95c32f612068be8dae74fa5fc4cf2db1592e +refs/heads/master: 97922b5462fa543484831d42ab0fe4562b9373fc diff --git a/trunk/drivers/video/via/accel.c b/trunk/drivers/video/via/accel.c index 9d4f3a49ba4a..d5077dfa9e00 100644 --- a/trunk/drivers/video/via/accel.c +++ b/trunk/drivers/video/via/accel.c @@ -137,7 +137,7 @@ static int hw_bitblt_1(void __iomem *engine, u8 op, u32 width, u32 height, tmp, dst_pitch); return -EINVAL; } - tmp = (tmp >> 3) | (dst_pitch << (16 - 3)); + tmp = VIA_PITCH_ENABLE | (tmp >> 3) | (dst_pitch << (16 - 3)); writel(tmp, engine + 0x38); if (op == VIA_BITBLT_FILL) @@ -352,6 +352,9 @@ int viafb_init_engine(struct fb_info *info) viapar->shared->vq_vram_addr = viapar->fbmem_free; viapar->fbmem_used += VQ_SIZE; + /* Init 2D engine reg to reset 2D engine */ + writel(0x0, engine + VIA_REG_KEYCONTROL); + /* Init AGP and VQ regs */ switch (chip_name) { case UNICHROME_K8M890: