2 files changed, 9 insertions, 1 deletions

diff --git a/drivers/gpu/drm/nouveau/core/engine/fifo/base.c b/drivers/gpu/drm/nouveau/core/engine/fifo/base.c
index 7341ebe131fa..d3ec436d9cb5 100644
--- a/drivers/gpu/drm/nouveau/core/engine/fifo/base.c
+++ b/drivers/gpu/drm/nouveau/core/engine/fifo/base.c
@@ -91,6 +91,8 @@ nouveau_fifo_channel_create_(struct nouveau_object *parent,
         if (!chan->user)
                 return -EFAULT;
 
+        nouveau_event_trigger(priv->cevent, 0);
+
         chan->size = size;
         return 0;
 }
@@ -167,6 +169,7 @@ nouveau_fifo_destroy(struct nouveau_fifo *priv)
 {
         kfree(priv->channel);
         nouveau_event_destroy(&priv->uevent);
+        nouveau_event_destroy(&priv->cevent);
         nouveau_engine_destroy(&priv->base);
 }
 
@@ -191,6 +194,10 @@ nouveau_fifo_create_(struct nouveau_object *parent,
         if (!priv->channel)
                 return -ENOMEM;
 
+        ret = nouveau_event_create(1, &priv->cevent);
+        if (ret)
+                return ret;
+
         ret = nouveau_event_create(1, &priv->uevent);
         if (ret)
                 return ret;
diff --git a/drivers/gpu/drm/nouveau/core/include/engine/fifo.h b/drivers/gpu/drm/nouveau/core/include/engine/fifo.h
index b46c197709f3..633c2f806482 100644
--- a/drivers/gpu/drm/nouveau/core/include/engine/fifo.h
+++ b/drivers/gpu/drm/nouveau/core/include/engine/fifo.h
@@ -65,7 +65,8 @@ struct nouveau_fifo_base {
 struct nouveau_fifo {
         struct nouveau_engine base;
 
-        struct nouveau_event *uevent;
+        struct nouveau_event *cevent; /* channel creation event */
+        struct nouveau_event *uevent; /* async user trigger */
 
         struct nouveau_object **channel;
         spinlock_t lock;