summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaarten Lankhorst <maarten.lankhorst@canonical.com>2012-10-23 20:17:29 +0200
committerMaarten Lankhorst <maarten.lankhorst@canonical.com>2012-10-23 20:17:31 +0200
commit6644a3a724a11150eba0c0082c8d4fe167b1755e (patch)
treea206f9f45fdbe7c1a7aebd5c1f315f76b63cdc32
parent2a757b7dffa85c30879653a1e52e33b8f4fa8806 (diff)
downloadxorg-driver-xf86-video-nouveau-6644a3a724a11150eba0c0082c8d4fe167b1755e.tar.gz
exa: remove exaMarkSync from download/upload screen
They're noops on nouveau since sync markers are unused and download/upload are always synchronous anyway from exa's POV. Signed-off-by: Maarten Lankhorst <maarten.lankhorst@canonical.com>
-rw-r--r--src/nouveau_exa.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/src/nouveau_exa.c b/src/nouveau_exa.c
index b0d63a1..8191aeb 100644
--- a/src/nouveau_exa.c
+++ b/src/nouveau_exa.c
@@ -321,20 +321,17 @@ nouveau_exa_upload_to_screen(PixmapPtr pdpix, int x, int y, int w, int h,
if (pNv->Architecture < NV_ARCH_50) {
if (NV04EXAUploadIFC(pScrn, src, src_pitch, pdpix,
x, y, w, h, cpp)) {
- exaMarkSync(pdpix->drawable.pScreen);
return TRUE;
}
} else
if (pNv->Architecture < NV_ARCH_C0) {
if (NV50EXAUploadSIFC(src, src_pitch, pdpix,
x, y, w, h, cpp)) {
- exaMarkSync(pdpix->drawable.pScreen);
return TRUE;
}
} else {
if (NVC0EXAUploadSIFC(src, src_pitch, pdpix,
x, y, w, h, cpp)) {
- exaMarkSync(pdpix->drawable.pScreen);
return TRUE;
}
}
@@ -372,7 +369,6 @@ nouveau_exa_upload_to_screen(PixmapPtr pdpix, int x, int y, int w, int h,
y += lines;
}
- exaMarkSync(pdpix->drawable.pScreen);
return TRUE;
/* fallback to memcpy-based transfer */
@@ -386,8 +382,6 @@ memcpy:
return FALSE;
dst = (char *)bo->map + (y * dst_pitch) + (x * cpp);
ret = NVAccelMemcpyRect(dst, src, h, dst_pitch, src_pitch, w*cpp);
- if (ret)
- exaMarkSync(pdpix->drawable.pScreen);
return ret;
}