fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 18:18:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

nouveau: Make the notifier stuff actually work..

Browse source
This commit is contained in:
Ben Skeggs 2006-12-26 21:33:58 +11:00
parent 0b2b2de6cf
commit 3fcb7d388d
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/mesa/drivers/dri/nouveau/nouveau_sync.c
View file

@ -18,7 +18,10 @@ nouveau_notifier_new(GLcontext *ctx, GLuint handle)
if (!notifier)
return NULL;
notifier->mem = nouveau_mem_alloc(ctx, NOUVEAU_MEM_FB, 32, 0);
notifier->mem = nouveau_mem_alloc(ctx,
NOUVEAU_MEM_FB | NOUVEAU_MEM_MAPPED,
32,
0);
if (!notifier->mem) {
FREE(notifier);
return NULL;
@ -65,14 +68,14 @@ nouveau_notifier_wait_status(nouveau_notifier *notifier, GLuint status,
unsigned int time = 0;
while (time <= timeout) {
if (n[NV_NOTIFY_STATE] & NV_NOTIFY_STATE_ERROR_CODE_MASK) {
if (n[NV_NOTIFY_STATE/4] & NV_NOTIFY_STATE_ERROR_CODE_MASK) {
MESSAGE("Notifier returned error: 0x%04x\n",
n[NV_NOTIFY_STATE] &
NV_NOTIFY_STATE_ERROR_CODE_MASK);
return GL_FALSE;
}
if (((n[NV_NOTIFY_STATE] & NV_NOTIFY_STATE_STATUS_MASK) >>
if (((n[NV_NOTIFY_STATE/4] & NV_NOTIFY_STATE_STATUS_MASK) >>
NV_NOTIFY_STATE_STATUS_SHIFT) == status)
return GL_TRUE;
@ -99,11 +102,12 @@ nouveau_notifier_wait_nop(GLcontext *ctx, nouveau_notifier *notifier,
OUT_RING (NV_NOTIFY_STYLE_WRITE_ONLY);
BEGIN_RING_SIZE(subc, NV_NOP, 1);
OUT_RING (0);
FIRE_RING();
ret = nouveau_notifier_wait_status(notifier,
NV_NOTIFY_STATE_STATUS_COMPLETED,
0 /* no timeout */);
if (ret) MESSAGE("wait on notifier failed\n");
if (ret == GL_FALSE) MESSAGE("wait on notifier failed\n");
}
GLboolean nouveauSyncInitFuncs(GLcontext *ctx)