1 files changed, 33 insertions, 20 deletions

diff --git a/drivers/video/via/accel.c b/drivers/video/via/accel.c
index e44893ea590d..3c969cdef0af 100644
--- a/drivers/video/via/accel.c
+++ b/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;
@@ -314,13 +315,11 @@ static int hw_bitblt_2(void __iomem *engine, u8 op, u32 width, u32 height,
         return 0;
 }
 
-int viafb_init_engine(struct fb_info *info)
+int viafb_setup_engine(struct fb_info *info)
 {
         struct viafb_par *viapar = info->par;
         void __iomem *engine;
-        int highest_reg, i;
-        u32 vq_start_addr, vq_end_addr, vq_start_low, vq_end_low, vq_high,
-                vq_len, chip_name = viapar->shared->chip_info.gfx_chip_name;
+        u32 chip_name = viapar->shared->chip_info.gfx_chip_name;
 
         engine = viapar->shared->vdev->engine_mmio;
         if (!engine) {
@@ -329,18 +328,6 @@ int viafb_init_engine(struct fb_info *info)
                 return -ENOMEM;
         }
 
-        /* Initialize registers to reset the 2D engine */
-        switch (viapar->shared->chip_info.twod_engine) {
-        case VIA_2D_ENG_M1:
-                highest_reg = 0x5c;
-                break;
-        default:
-                highest_reg = 0x40;
-                break;
-        }
-        for (i = 0; i <= highest_reg; i += 4)
-                writel(0x0, engine + i);
-
         switch (chip_name) {
         case UNICHROME_CLE266:
         case UNICHROME_K400:
@@ -356,6 +343,7 @@ int viafb_init_engine(struct fb_info *info)
                 break;
         case UNICHROME_VX800:
         case UNICHROME_VX855:
+        case UNICHROME_VX900:
                 viapar->shared->hw_bitblt = hw_bitblt_2;
                 break;
         default:
@@ -386,12 +374,36 @@ int viafb_init_engine(struct fb_info *info)
         viapar->shared->vdev->camera_fbmem_offset = viapar->fbmem_free;
 #endif
 
+        viafb_reset_engine(viapar);
+        return 0;
+}
+
+void viafb_reset_engine(struct viafb_par *viapar)
+{
+        void __iomem *engine = viapar->shared->vdev->engine_mmio;
+        int highest_reg, i;
+        u32 vq_start_addr, vq_end_addr, vq_start_low, vq_end_low, vq_high,
+                vq_len, chip_name = viapar->shared->chip_info.gfx_chip_name;
+
+        /* Initialize registers to reset the 2D engine */
+        switch (viapar->shared->chip_info.twod_engine) {
+        case VIA_2D_ENG_M1:
+                highest_reg = 0x5c;
+                break;
+        default:
+                highest_reg = 0x40;
+                break;
+        }
+        for (i = 0; i <= highest_reg; i += 4)
+                writel(0x0, engine + i);
+
         /* Init AGP and VQ regs */
         switch (chip_name) {
         case UNICHROME_K8M890:
         case UNICHROME_P4M900:
         case UNICHROME_VX800:
         case UNICHROME_VX855:
+        case UNICHROME_VX900:
                 writel(0x00100000, engine + VIA_REG_CR_TRANSET);
                 writel(0x680A0000, engine + VIA_REG_CR_TRANSPACE);
                 writel(0x02000000, engine + VIA_REG_CR_TRANSPACE);
@@ -428,6 +440,7 @@ int viafb_init_engine(struct fb_info *info)
         case UNICHROME_P4M900:
         case UNICHROME_VX800:
         case UNICHROME_VX855:
+        case UNICHROME_VX900:
                 vq_start_low |= 0x20000000;
                 vq_end_low |= 0x20000000;
                 vq_high |= 0x20000000;
@@ -473,7 +486,7 @@ int viafb_init_engine(struct fb_info *info)
         writel(0x0, engine + VIA_REG_CURSOR_ORG);
         writel(0x0, engine + VIA_REG_CURSOR_BG);
         writel(0x0, engine + VIA_REG_CURSOR_FG);
-        return 0;
+        return;
 }
 
 void viafb_show_hw_cursor(struct fb_info *info, int Status)