diff options
| author | Christoph Bumiller <e0425955@student.tuwien.ac.at> | 2010-12-09 00:29:58 +0100 |
|---|---|---|
| committer | Christoph Bumiller <e0425955@student.tuwien.ac.at> | 2010-12-09 01:31:58 +0100 |
| commit | dd7fd8263e0e9f92412fb20086e4c8acf8cab099 (patch) | |
| tree | 93b7c23154fcb90758f7ee3f74faaa9f1f57cf7e | |
| parent | b4cf5a8f2276392945c2530f0d6fe96b5ab4b5da (diff) | |
| download | xorg-driver-xf86-video-nouveau-dd7fd8263e0e9f92412fb20086e4c8acf8cab099.tar.gz | |
exa: don't fall back to nv04 m2mf if nvc0 m2mf fails
| -rw-r--r-- | src/nouveau_exa.c | 25 |
1 files 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; } |