summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2010-01-11 10:07:11 +1000
committerBen Skeggs <bskeggs@redhat.com>2010-01-11 11:47:26 +1000
commit6975651b0b74dca6edaee759fb1003f65189f1df (patch)
tree1252297ab2b37f8af2f99d7eb899a88f8fd98bab
parent17485c234ff191cee3dd19e3dd693a80b024e189 (diff)
xv: ifdef out another problematic piece of overlay support for the moment
-rw-r--r--src/nouveau_xv.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/nouveau_xv.c b/src/nouveau_xv.c
index cb950e4..a6cec9b 100644
--- a/src/nouveau_xv.c
+++ b/src/nouveau_xv.c
@@ -984,6 +984,7 @@ NVPutImage(ScrnInfoPtr pScrn, short src_x, short src_y, short drw_x,
if (ret)
return BadAlloc;
+#ifdef NVOVL_SUPPORT
if (action_flags & USE_OVERLAY) {
ret = nouveau_bo_pin(pPriv->video_mem, NOUVEAU_BO_VRAM);
if (ret) {
@@ -991,6 +992,7 @@ NVPutImage(ScrnInfoPtr pScrn, short src_x, short src_y, short drw_x,
return BadAlloc;
}
}
+#endif
/* The overlay supports hardware double buffering. We handle this here*/
offset = 0;