Pull thermal into release branch

[~andy/linux] / drivers / video / aty / mach64_accel.c

diff --git a/drivers/video/aty/mach64_accel.c b/drivers/video/aty/mach64_accel.c
index c98f4a442134329e6bdef668fce1b84b4cdad4e8..a8f60c33863c6f7df1e239e66de510347a107c22 100644 (file)
--- a/drivers/video/aty/mach64_accel.c
+++ b/drivers/video/aty/mach64_accel.c
@@ -3,7 +3,6 @@
  *  ATI Mach64 Hardware Acceleration
  */
 
-#include <linux/sched.h>
 #include <linux/delay.h>
 #include <linux/fb.h>
 #include <video/mach64.h>
@@ -200,8 +199,6 @@ void atyfb_copyarea(struct fb_info *info, const struct fb_copyarea *area)
        if (!area->width || !area->height)
                return;
        if (!par->accel_flags) {
-               if (par->blitter_may_be_busy)
-                       wait_for_idle(par);
                cfb_copyarea(info, area);
                return;
        }
@@ -248,8 +245,6 @@ void atyfb_fillrect(struct fb_info *info, const struct fb_fillrect *rect)
        if (!rect->width || !rect->height)
                return;
        if (!par->accel_flags) {
-               if (par->blitter_may_be_busy)
-                       wait_for_idle(par);
                cfb_fillrect(info, rect);
                return;
        }
@@ -288,14 +283,10 @@ void atyfb_imageblit(struct fb_info *info, const struct fb_image *image)
                return;
        if (!par->accel_flags ||
            (image->depth != 1 && info->var.bits_per_pixel != image->depth)) {
-               if (par->blitter_may_be_busy)
-                       wait_for_idle(par);
-
                cfb_imageblit(info, image);
                return;
        }
 
-       wait_for_idle(par);
        pix_width = pix_width_save = aty_ld_le32(DP_PIX_WIDTH, par);
        host_cntl = aty_ld_le32(HOST_CNTL, par) | HOST_BYTE_ALIGN;
 
@@ -425,8 +416,6 @@ void atyfb_imageblit(struct fb_info *info, const struct fb_image *image)
                }
        }
 
-       wait_for_idle(par);
-
        /* restore pix_width */
        wait_for_fifo(1, par);
        aty_st_le32(DP_PIX_WIDTH, pix_width_save, par);