1 files changed, 7 insertions, 8 deletions

diff --git a/drivers/video/aty/mach64_cursor.c b/drivers/video/aty/mach64_cursor.c
index faf95da8fcb..04c710804bb 100644
--- a/drivers/video/aty/mach64_cursor.c
+++ b/drivers/video/aty/mach64_cursor.c
@@ -77,9 +77,13 @@ static int atyfb_cursor(struct fb_info *info, struct fb_cursor *cursor)
         if (par->asleep)
                 return -EPERM;
 
-        /* Hide cursor */
         wait_for_fifo(1, par);
-        aty_st_le32(GEN_TEST_CNTL, aty_ld_le32(GEN_TEST_CNTL, par) & ~HWCURSOR_ENABLE, par);
+        if (cursor->enable)
+                aty_st_le32(GEN_TEST_CNTL, aty_ld_le32(GEN_TEST_CNTL, par)
+                            | HWCURSOR_ENABLE, par);
+        else
+                aty_st_le32(GEN_TEST_CNTL, aty_ld_le32(GEN_TEST_CNTL, par)
+                                & ~HWCURSOR_ENABLE, par);
 
         /* set position */
         if (cursor->set & FB_CUR_SETPOS) {
@@ -109,7 +113,7 @@ static int atyfb_cursor(struct fb_info *info, struct fb_cursor *cursor)
                         y<<=1;
                         h<<=1;
                 }
-                wait_for_fifo(4, par);
+                wait_for_fifo(3, par);
                 aty_st_le32(CUR_OFFSET, (info->fix.smem_len >> 3) + (yoff << 1), par);
                 aty_st_le32(CUR_HORZ_VERT_OFF,
                             ((u32) (64 - h + yoff) << 16) | xoff, par);
@@ -177,11 +181,6 @@ static int atyfb_cursor(struct fb_info *info, struct fb_cursor *cursor)
             }
         }
 
-        if (cursor->enable) {
-                wait_for_fifo(1, par);
-                aty_st_le32(GEN_TEST_CNTL, aty_ld_le32(GEN_TEST_CNTL, par)
-                            | HWCURSOR_ENABLE, par);
-        }
         return 0;
 }