patch-2_6_7-vs1_9_1_12

[linux-2.6.git] / drivers / video / aty / radeon_accel.c

diff --git a/drivers/video/aty/radeon_accel.c b/drivers/video/aty/radeon_accel.c
index c662e35..82614b4 100644 (file)
--- a/drivers/video/aty/radeon_accel.c
+++ b/drivers/video/aty/radeon_accel.c
@@ -13,7 +13,10 @@ static void radeonfb_prim_fillrect(struct radeonfb_info *rinfo,
                rinfo->dp_gui_master_cntl  /* contains, like GMC_DST_32BPP */
                 | GMC_BRUSH_SOLID_COLOR
                 | ROP3_P);
-       OUTREG(DP_BRUSH_FRGD_CLR, region->color);
+       if (radeon_get_dstbpp(rinfo->depth) != DST_8BPP)
+               OUTREG(DP_BRUSH_FRGD_CLR, rinfo->pseudo_palette[region->color]);
+       else
+               OUTREG(DP_BRUSH_FRGD_CLR, region->color);
        OUTREG(DP_WRITE_MSK, 0xffffffff);
        OUTREG(DP_CNTL, (DST_X_LEFT_TO_RIGHT | DST_Y_TOP_TO_BOTTOM));
 
@@ -53,6 +56,18 @@ void radeonfb_fillrect(struct fb_info *info, const struct fb_fillrect *region)
 static void radeonfb_prim_copyarea(struct radeonfb_info *rinfo, 
                                   const struct fb_copyarea *area)
 {
+       int xdir, ydir;
+       u32 sx, sy, dx, dy, w, h;
+
+       w = area->width; h = area->height;
+       dx = area->dx; dy = area->dy;
+       sx = area->sx; sy = area->sy;
+       xdir = sx - dx;
+       ydir = sy - dy;
+
+       if ( xdir < 0 ) { sx += w-1; dx += w-1; }
+       if ( ydir < 0 ) { sy += h-1; dy += h-1; }
+
        radeon_fifo_wait(3);
        OUTREG(DP_GUI_MASTER_CNTL,
                rinfo->dp_gui_master_cntl /* i.e. GMC_DST_32BPP */
@@ -60,12 +75,13 @@ static void radeonfb_prim_copyarea(struct radeonfb_info *rinfo,
                | ROP3_S 
                | DP_SRC_RECT );
        OUTREG(DP_WRITE_MSK, 0xffffffff);
-       OUTREG(DP_CNTL, (DST_X_LEFT_TO_RIGHT | DST_Y_TOP_TO_BOTTOM));
+       OUTREG(DP_CNTL, (xdir>=0 ? DST_X_LEFT_TO_RIGHT : 0)
+                       | (ydir>=0 ? DST_Y_TOP_TO_BOTTOM : 0));
 
        radeon_fifo_wait(3);
-       OUTREG(SRC_Y_X, (area->sy << 16) | area->sx);
-       OUTREG(DST_Y_X, (area->dy << 16) | area->dx);
-       OUTREG(DST_HEIGHT_WIDTH, (area->height << 16) | area->width);
+       OUTREG(SRC_Y_X, (sy << 16) | sx);
+       OUTREG(DST_Y_X, (dy << 16) | dx);
+       OUTREG(DST_HEIGHT_WIDTH, (h << 16) | w);
 }