drm/nouveau/fifo: implement channel creation event generation

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

diff --git a/drivers/gpu/drm/nouveau/core/engine/fifo/base.c b/drivers/gpu/drm/nouveau/core/engine/fifo/base.c
index 7341ebe131fabc9de63a5ae37849a7f180f3b3e7..d3ec436d9cb5f249eff5e7146f842d325980ff8e 100644 (file)
--- 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 b46c197709f394c4224d57b7bcde433bb8e71c2d..633c2f80648264ca49020a4ef5b593291d5d7120 100644 (file)
--- 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;