drm/nouveau: rework to new fence interface

Signed-off-by: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Acked-by: Ben Skeggs <bskeggs@redhat.com>

1 files changed, 15 insertions, 7 deletions

diff --git a/drivers/gpu/drm/nouveau/nouveau_fence.h b/drivers/gpu/drm/nouveau/nouveau_fence.h
index c57bb61da58c..44efd8c7426c 100644
--- a/drivers/gpu/drm/nouveau/nouveau_fence.h
+++ b/drivers/gpu/drm/nouveau/nouveau_fence.h
@@ -1,18 +1,21 @@
 #ifndef __NOUVEAU_FENCE_H__
 #define __NOUVEAU_FENCE_H__
 
+#include <linux/fence.h>
+#include <nvif/notify.h>
+
 struct nouveau_drm;
+struct nouveau_bo;
 
 struct nouveau_fence {
+        struct fence base;
+
         struct list_head head;
-        struct list_head work;
-        struct kref kref;
 
         bool sysmem;
 
         struct nouveau_channel *channel;
         unsigned long timeout;
-        u32 sequence;
 };
 
 int  nouveau_fence_new(struct nouveau_channel *, bool sysmem,
@@ -25,9 +28,10 @@ int  nouveau_fence_emit(struct nouveau_fence *, struct nouveau_channel *);
 bool nouveau_fence_done(struct nouveau_fence *);
 void nouveau_fence_work(struct nouveau_fence *, void (*)(void *), void *);
 int  nouveau_fence_wait(struct nouveau_fence *, bool lazy, bool intr);
-int  nouveau_fence_sync(struct nouveau_fence *, struct nouveau_channel *);
+int  nouveau_fence_sync(struct nouveau_bo *, struct nouveau_channel *);
 
 struct nouveau_fence_chan {
+        spinlock_t lock;
         struct list_head pending;
         struct list_head flip;
 
@@ -38,8 +42,12 @@ struct nouveau_fence_chan {
         int  (*emit32)(struct nouveau_channel *, u64, u32);
         int  (*sync32)(struct nouveau_channel *, u64, u32);
 
-        spinlock_t lock;
         u32 sequence;
+        u32 context;
+        char name[24];
+
+        struct nvif_notify notify;
+        int notify_ref;
 };
 
 struct nouveau_fence_priv {
@@ -49,13 +57,13 @@ struct nouveau_fence_priv {
         int  (*context_new)(struct nouveau_channel *);
         void (*context_del)(struct nouveau_channel *);
 
-        wait_queue_head_t waiting;
+        u32 contexts, context_base;
         bool uevent;
 };
 
 #define nouveau_fence(drm) ((struct nouveau_fence_priv *)(drm)->fence)
 
-void nouveau_fence_context_new(struct nouveau_fence_chan *);
+void nouveau_fence_context_new(struct nouveau_channel *, struct nouveau_fence_chan *);
 void nouveau_fence_context_del(struct nouveau_fence_chan *);
 
 int nv04_fence_create(struct nouveau_drm *);