mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

drm/nouveau/core: Add priv field for event handlers 

Provide private field for event handlers exclusive use.
Convert nouveau_fence_wait_uevent() and
nouveau_fence_wait_uevent_handler(); drop struct nouveau_fence_uevent.

Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
Peter Hurley 2013-08-27 16:12:54 -04:00 committed by Ben Skeggs
parent ca3562226a
commit a25f83ba89
2 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/gpu/drm/nouveau/core/include/core/event.h
View File

@ -7,6 +7,7 @@
struct nouveau_eventh {
struct list_head head;
void *priv;
int (*func)(struct nouveau_eventh *, int index);
};

20
drivers/gpu/drm/nouveau/nouveau_fence.c
View File

@ -165,17 +165,11 @@ nouveau_fence_done(struct nouveau_fence *fence)
return !fence->channel;
}
struct nouveau_fence_uevent {
struct nouveau_eventh handler;
struct nouveau_fence_priv *priv;
};
static int
nouveau_fence_wait_uevent_handler(struct nouveau_eventh *event, int index)
nouveau_fence_wait_uevent_handler(struct nouveau_eventh *handler, int index)
{
struct nouveau_fence_uevent *uevent =
container_of(event, struct nouveau_fence_uevent, handler);
wake_up_all(&uevent->priv->waiting);
struct nouveau_fence_priv *priv = handler->priv;
wake_up_all(&priv->waiting);
return NVKM_EVENT_KEEP;
}
@ -186,13 +180,13 @@ nouveau_fence_wait_uevent(struct nouveau_fence *fence, bool intr)
struct nouveau_channel *chan = fence->channel;
struct nouveau_fifo *pfifo = nouveau_fifo(chan->drm->device);
struct nouveau_fence_priv *priv = chan->drm->fence;
struct nouveau_fence_uevent uevent = {
.handler.func = nouveau_fence_wait_uevent_handler,
struct nouveau_eventh handler = {
.func = nouveau_fence_wait_uevent_handler,
.priv = priv,
};
int ret = 0;
nouveau_event_get(pfifo->uevent, 0, &uevent.handler);
nouveau_event_get(pfifo->uevent, 0, &handler);
if (fence->timeout) {
unsigned long timeout = fence->timeout - jiffies;
@ -224,7 +218,7 @@ nouveau_fence_wait_uevent(struct nouveau_fence *fence, bool intr)
}
}
nouveau_event_put(pfifo->uevent, 0, &uevent.handler);
nouveau_event_put(pfifo->uevent, 0, &handler);
if (unlikely(ret < 0))
return ret;