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:02:07 +1000 |
| commit | 6bfa52ad8c0534da593af9ef993cad6964d0de09 (patch) | |
| tree | b6de2337f5790de0402372c7777f54e108fa13ed /nvkm/engine/fifo/nvc0.c | |
| parent | 64db56233cd5edc68bdb1c7084b7a4eaa0ead00f (diff) | |
| download | nouveau-6bfa52ad8c0534da593af9ef993cad6964d0de09.tar.gz | |
core: allow event source to handle multiple event types per index
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'nvkm/engine/fifo/nvc0.c')
| -rw-r--r-- | nvkm/engine/fifo/nvc0.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nvkm/engine/fifo/nvc0.c b/nvkm/engine/fifo/nvc0.c index fa1e71987..ae4a4dc56 100644 --- a/nvkm/engine/fifo/nvc0.c +++ b/nvkm/engine/fifo/nvc0.c @@ -730,7 +730,7 @@ nvc0_fifo_intr_engine_unit(struct nvc0_fifo_priv *priv, int engn) for (unkn = 0; unkn < 8; unkn++) { u32 ints = (intr >> (unkn * 0x04)) & inte; if (ints & 0x1) { - nouveau_event_trigger(priv->base.uevent, 0); + nouveau_event_trigger(priv->base.uevent, 1, 0); ints &= ~1; } if (ints) { @@ -827,14 +827,14 @@ nvc0_fifo_intr(struct nouveau_subdev *subdev) } static void -nvc0_fifo_uevent_enable(struct nouveau_event *event, int index) +nvc0_fifo_uevent_enable(struct nouveau_event *event, int type, int index) { struct nvc0_fifo_priv *priv = event->priv; nv_mask(priv, 0x002140, 0x80000000, 0x80000000); } static void -nvc0_fifo_uevent_disable(struct nouveau_event *event, int index) +nvc0_fifo_uevent_disable(struct nouveau_event *event, int type, int index) { struct nvc0_fifo_priv *priv = event->priv; nv_mask(priv, 0x002140, 0x80000000, 0x00000000); |