From 0bd459488bf88084d703d801bfd5e79ea6d2b5a5 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Thu, 27 Jan 2005 03:52:49 +0000 Subject: [PATCH] Move the bailing out due to ATIUploadToScreen() being unfinished up farther, so that the traces aren't as confusing. --- hw/kdrive/ati/ati_draw.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/hw/kdrive/ati/ati_draw.c b/hw/kdrive/ati/ati_draw.c index a47dc8973..a6ea02521 100644 --- a/hw/kdrive/ati/ati_draw.c +++ b/hw/kdrive/ati/ati_draw.c @@ -568,6 +568,10 @@ ATIUploadToScreen(PixmapPtr pDst, char *src, int src_pitch) RING_LOCALS; ENTER_DRAW (pDst); + + LEAVE_DRAW (pDst); + /* XXX: Hostdata uploads aren't working yet. */ + return FALSE; dst_offset = ((CARD8 *)pDst->devPrivate.ptr - pScreenPriv->screen->memory_base); @@ -595,11 +599,6 @@ ATIUploadToScreen(PixmapPtr pDst, char *src, int src_pitch) if (atis->using_pio) return FALSE; - LEAVE_DRAW (pDst); - - /* XXX: Hostdata uploads aren't working yet. */ - return FALSE; - dwords = (width * height * (bpp / 8) + 3) / 4; /* Flush pixel cache so nothing being written to the destination