Merge tag 'pci-v3.16-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaa...

[firefly-linux-kernel-4.4.55.git] / drivers / gpu / drm / nouveau / nouveau_fence.c

diff --git a/drivers/gpu/drm/nouveau/nouveau_fence.c b/drivers/gpu/drm/nouveau/nouveau_fence.c
index 90074d620e31265bdcc70d4b7285fc9be077fee8..ab5ea3b0d6665cfbaea93c51781c03f6ff3eeef2 100644 (file)
--- 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)