From dd7fd8263e0e9f92412fb20086e4c8acf8cab099 Mon Sep 17 00:00:00 2001 From: Christoph Bumiller Date: Thu, 9 Dec 2010 00:29:58 +0100 Subject: exa: don't fall back to nv04 m2mf if nvc0 m2mf fails --- src/nouveau_exa.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/src/nouveau_exa.c b/src/nouveau_exa.c index d900e99..407c025 100644 --- a/src/nouveau_exa.c +++ b/src/nouveau_exa.c @@ -377,12 +377,15 @@ nouveau_exa_download_from_screen(PixmapPtr pspix, int x, int y, int w, int h, offset = (y * src_pitch) + (x * cpp); if (pNv->GART) { - if ((pNv->Architecture >= NV_ARCH_C0) && - NVC0AccelDownloadM2MF(pspix, x, y, w, h, dst, dst_pitch)) - return TRUE; - else - if (NVAccelDownloadM2MF(pspix, x, y, w, h, dst, dst_pitch)) - return TRUE; + if (pNv->Architecture >= NV_ARCH_C0) { + if (NVC0AccelDownloadM2MF(pspix, x, y, w, h, + dst, dst_pitch)) + return TRUE; + } else { + if (NVAccelDownloadM2MF(pspix, x, y, w, h, + dst, dst_pitch)) + return TRUE; + } } bo = nouveau_pixmap_bo(pspix); @@ -435,12 +438,10 @@ nouveau_exa_upload_to_screen(PixmapPtr pdpix, int x, int y, int w, int h, /* try gart-based transfer */ if (pNv->GART) { - if ((pNv->Architecture >= NV_ARCH_C0) && - NVC0AccelUploadM2MF(pdpix, x, y, w, h, src, src_pitch)) { - exaMarkSync(pdpix->drawable.pScreen); - return TRUE; - } else - if (NVAccelUploadM2MF(pdpix, x, y, w, h, src, src_pitch)) { + Bool ret = (pNv->Architecture >= NV_ARCH_C0) ? + NVC0AccelUploadM2MF(pdpix, x, y, w, h, src, src_pitch) : + NVAccelUploadM2MF(pdpix, x, y, w, h, src, src_pitch); + if (ret) { exaMarkSync(pdpix->drawable.pScreen); return TRUE; } -- cgit v1.2.1