From 5910231cbeb762057582a7811f3340d11049e8a1 Mon Sep 17 00:00:00 2001
From: Javier Martinez Canillas <martinez.javier@gmail.com>
Date: Mon, 21 Feb 2011 10:09:05 +0100
Subject: [PATCH] --- yaml --- r: 236111 b: refs/heads/master c:
 cfd6ea0b731d048037ba00b8dd3777a91b9675e0 h: refs/heads/master i:   236109:
 068adb72c853bf3e9c5f05ae7fda6812ea2afeb1   236107:
 c1a625464e920ee3b08a6d7cd3a2c87e140b5930   236103:
 3ec820760b53dab74416c0541070c5d5dc71a562   236095:
 f1cfe5969613aa021d37bbda727384308e109607 v: v3

---
 [refs]                                  |  2 +-
 trunk/drivers/staging/xgifb/XGI_accel.c | 57 ++-----------------------
 2 files changed, 4 insertions(+), 55 deletions(-)

diff --git a/[refs] b/[refs]
index a13e87cfa911..0c57e9ac94b8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fc3cc2caa07568de92cc84780b89b5cf9fbf28b7
+refs/heads/master: cfd6ea0b731d048037ba00b8dd3777a91b9675e0
diff --git a/trunk/drivers/staging/xgifb/XGI_accel.c b/trunk/drivers/staging/xgifb/XGI_accel.c
index 79549742cff1..7f485fea391a 100644
--- a/trunk/drivers/staging/xgifb/XGI_accel.c
+++ b/trunk/drivers/staging/xgifb/XGI_accel.c
@@ -216,73 +216,22 @@ void XGIfb_syncaccel(void)
 
 int fbcon_XGI_sync(struct fb_info *info)
 {
-    if(!XGIfb_accel) return 0;
-    CRITFLAGS
-
-    XGI310Sync();
-
-   CRITEND
-   return 0;
+	return 0;
 }
 
 void fbcon_XGI_fillrect(struct fb_info *info, const struct fb_fillrect *rect)
 {
-   int col=0;
-   CRITFLAGS
-
-
-   if(!rect->width || !rect->height)
-   	return;
+	if (!rect->width || !rect->height)
+		return;
 
-   if(!XGIfb_accel) {
 	cfb_fillrect(info, rect);
 	return;
-   }
-
-   switch(info->var.bits_per_pixel) {
-		case 8: col = rect->color;
-			break;
-		case 16: col = ((u32 *)(info->pseudo_palette))[rect->color];
-			 break;
-		case 32: col = ((u32 *)(info->pseudo_palette))[rect->color];
-			 break;
-	}
-
-
-	   CRITBEGIN
-	   XGI310SetupForSolidFill(col, myrops[rect->rop], 0);
-	   XGI310SubsequentSolidFillRect(rect->dx, rect->dy, rect->width, rect->height);
-	   CRITEND
-	   XGI310Sync();
-
-
 }
 
 void fbcon_XGI_copyarea(struct fb_info *info, const struct fb_copyarea *area)
 {
-   int xdir, ydir;
-   CRITFLAGS
-
-
-   if(!XGIfb_accel) {
    	cfb_copyarea(info, area);
 	return;
-   }
-
-   if(!area->width || !area->height)
-   	return;
-
-   if(area->sx < area->dx) xdir = 0;
-   else                    xdir = 1;
-   if(area->sy < area->dy) ydir = 0;
-   else                    ydir = 1;
-
-      CRITBEGIN
-      XGI310SetupForScreenToScreenCopy(xdir, ydir, 3, 0, -1);
-      XGI310SubsequentScreenToScreenCopy(area->sx, area->sy, area->dx, area->dy, area->width, area->height);
-      CRITEND
-      XGI310Sync();
-
 }