Some accel cleanups. Fix a VT switch segfault

1 files changed, 3 insertions, 25 deletions

diff --git a/src/via_accel.c b/src/via_accel.c
index ed13667..b6a5433 100644
--- a/src/via_accel.c
+++ b/src/via_accel.c
@@ -588,32 +588,12 @@ viaExaPixmapIsOffscreen(PixmapPtr p)
     ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
     VIAPtr pVia = VIAPTR(pScrn);
 
-    return (viaInBuffer(&pVia->offscreen, p->devPrivate.ptr) != NULL);
-}
-
-static unsigned long
-viaExaPixmapOffset(PixmapPtr p)
-{
-    ScreenPtr pScreen = p->drawable.pScreen;
-    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
-    VIAPtr pVia = VIAPTR(pScrn);
-    void *ptr;
-    struct _ViaOffscreenBuffer *buf;
-
-    ptr = (void *) exaGetPixmapOffset(p) + 
-	(unsigned long) pVia->exaMem.virtual;
-    
-    buf = viaInBuffer(&pVia->offscreen, ptr);
-
-    if (!buf) 
-	FatalError("Offscreen pixmap is not offscreen.\n");
+    if (pVia->vtNotified == TRUE)
+	return FALSE;
 
-    return (unsigned long)ptr - (unsigned long) buf->virtual +
-	driBOOffset(buf->buf);
+    return (viaInBuffer(&pVia->offscreen, p->devPrivate.ptr) != NULL);
 }
 
-
-
 static Bool
 viaExaPrepareSolid(PixmapPtr pPixmap, int alu, Pixel planeMask, Pixel fg)
 {
@@ -702,8 +682,6 @@ viaExaPrepareCopy(PixmapPtr pSrcPixmap, PixmapPtr pDstPixmap, int xdir,
     if (exaGetPixmapPitch(pDstPixmap) & 7)
         return FALSE;
 
-    tdc->srcOffset = viaExaPixmapOffset(pSrcPixmap);
-
     tdc->cmd = VIA_GEC_BLT | VIAACCELCOPYROP(alu);
     if (xdir < 0)
         tdc->cmd |= VIA_GEC_DECX;