diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2014-05-13 15:30:15 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2014-06-11 16:09:13 +1000 |
| commit | 8e8832e8a8ad4159fd6f9cb13975941c5de50c0f (patch) | |
| tree | c8ba570190a9f53d2355cb60d4a21b58c88d31dd /drivers/gpu/drm/nouveau/nouveau_fence.c | |
| parent | 255b329ca7f0e9b5fa6da3a68bb713684fe10305 (diff) | |
| download | blackbird-op-linux-8e8832e8a8ad4159fd6f9cb13975941c5de50c0f.tar.gz blackbird-op-linux-8e8832e8a8ad4159fd6f9cb13975941c5de50c0f.zip | |
drm/nouveau/core: allow event source to handle multiple event types per index
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_fence.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_fence.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_fence.c b/drivers/gpu/drm/nouveau/nouveau_fence.c index 90074d620e31..ab5ea3b0d666 100644 --- a/drivers/gpu/drm/nouveau/nouveau_fence.c +++ b/drivers/gpu/drm/nouveau/nouveau_fence.c @@ -166,7 +166,7 @@ nouveau_fence_done(struct nouveau_fence *fence) } static int -nouveau_fence_wait_uevent_handler(void *data, int index) +nouveau_fence_wait_uevent_handler(void *data, u32 type, int index) { struct nouveau_fence_priv *priv = data; wake_up_all(&priv->waiting); @@ -183,7 +183,7 @@ nouveau_fence_wait_uevent(struct nouveau_fence *fence, bool intr) struct nouveau_eventh *handler; int ret = 0; - ret = nouveau_event_new(pfifo->uevent, 0, + ret = nouveau_event_new(pfifo->uevent, 1, 0, nouveau_fence_wait_uevent_handler, priv, &handler); if (ret) |
