From b259b7ce5e57e1d20111878318b4703a14ec27ec Mon Sep 17 00:00:00 2001 From: Maarten Maathuis Date: Fri, 1 Jan 2010 20:16:13 +0100 Subject: nv50: always set semaphore handle and offset - This is in preperation of using semaphores for more than one thing. Signed-off-by: Maarten Maathuis --- src/nv50_accel.c | 3 --- src/nv50_xv.c | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/nv50_accel.c b/src/nv50_accel.c index 4804c77..f42854f 100644 --- a/src/nv50_accel.c +++ b/src/nv50_accel.c @@ -85,9 +85,6 @@ NVAccelInitNV50TCL(ScrnInfoPtr pScrn) if (MARK_RING(chan, 512, 32)) return FALSE; - BEGIN_RING(chan, nvsw, 0x0060, 2); - OUT_RING (chan, pNv->vblank_sem->handle); - OUT_RING (chan, 0); BEGIN_RING(chan, nvsw, 0x018c, 1); OUT_RING (chan, pNv->vblank_sem->handle); BEGIN_RING(chan, nvsw, 0x0400, 1); diff --git a/src/nv50_xv.c b/src/nv50_xv.c index 4ac0c50..eb537e2 100644 --- a/src/nv50_xv.c +++ b/src/nv50_xv.c @@ -273,6 +273,9 @@ NV50EmitWaitForVBlank(PixmapPtr ppix, int x, int y, int w, int h) if (!crtcs) return; + BEGIN_RING(chan, nvsw, 0x0060, 2); + OUT_RING (chan, pNv->vblank_sem->handle); + OUT_RING (chan, 0); BEGIN_RING(chan, nvsw, 0x006c, 1); OUT_RING (chan, 0x22222222); BEGIN_RING(chan, nvsw, 0x0404, 2); -- cgit v1.2.3