diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2014-01-09 12:30:43 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2014-01-23 13:38:44 +1000 |
| commit | 649ec925ae32eaca304589bafb1cb0fef285bbfe (patch) | |
| tree | a4026254f5bfa4b74016d9f318c3b24837014d3c /drivers/gpu/drm/nouveau/core/engine/fifo/nve0.c | |
| parent | e1b6b14ad5e955c85bdaa8a375554ec1669eed21 (diff) | |
| download | op-kernel-dev-649ec925ae32eaca304589bafb1cb0fef285bbfe.zip op-kernel-dev-649ec925ae32eaca304589bafb1cb0fef285bbfe.tar.gz | |
drm/nve0/fifo: keep mmu fault interrupts enabled at all times
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/core/engine/fifo/nve0.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/core/engine/fifo/nve0.c | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/core/engine/fifo/nve0.c b/drivers/gpu/drm/nouveau/core/engine/fifo/nve0.c index c4860e3..3bf5ba8 100644 --- a/drivers/gpu/drm/nouveau/core/engine/fifo/nve0.c +++ b/drivers/gpu/drm/nouveau/core/engine/fifo/nve0.c @@ -754,6 +754,21 @@ nve0_fifo_uevent_disable(struct nouveau_event *event, int index) } int +nve0_fifo_fini(struct nouveau_object *object, bool suspend) +{ + struct nve0_fifo_priv *priv = (void *)object; + int ret; + + ret = nouveau_fifo_fini(&priv->base, suspend); + if (ret) + return ret; + + /* allow mmu fault interrupts, even when we're not using fifo */ + nv_mask(priv, 0x002140, 0x10000000, 0x10000000); + return 0; +} + +int nve0_fifo_init(struct nouveau_object *object) { struct nve0_fifo_priv *priv = (void *)object; @@ -855,7 +870,7 @@ nve0_fifo_oclass = &(struct nve0_fifo_impl) { .ctor = nve0_fifo_ctor, .dtor = nve0_fifo_dtor, .init = nve0_fifo_init, - .fini = _nouveau_fifo_fini, + .fini = nve0_fifo_fini, }, .channels = 4096, }.base; |
