summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/nouveau/core/engine/fifo/nv84.c
diff options
context:
space:
mode:
authorRoy Spliet <rspliet@eclipso.eu>2013-11-17 20:09:05 +0100
committerBen Skeggs <bskeggs@redhat.com>2013-12-03 23:28:55 +1000
commitb1cd49763bb4b0dacb7795d1152cd4e6660ab7bc (patch)
tree927c4a0559eb1c2db5b4546fbbefb937ee206364 /drivers/gpu/drm/nouveau/core/engine/fifo/nv84.c
parentefffa9841cf42ae8350d421070cea962b063df8c (diff)
downloadop-kernel-dev-b1cd49763bb4b0dacb7795d1152cd4e6660ab7bc.zip
op-kernel-dev-b1cd49763bb4b0dacb7795d1152cd4e6660ab7bc.tar.gz
drm/nouveau/fifo: Hook up pause and resume for NV50 and NV84+
Signed-off-by: Roy Spliet <rspliet@eclipso.eu> Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/core/engine/fifo/nv84.c')
-rw-r--r--drivers/gpu/drm/nouveau/core/engine/fifo/nv84.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/core/engine/fifo/nv84.c b/drivers/gpu/drm/nouveau/core/engine/fifo/nv84.c
index 0908dc8..fe0f41e 100644
--- a/drivers/gpu/drm/nouveau/core/engine/fifo/nv84.c
+++ b/drivers/gpu/drm/nouveau/core/engine/fifo/nv84.c
@@ -35,6 +35,7 @@
#include <engine/dmaobj.h>
#include <engine/fifo.h>
+#include "nv04.h"
#include "nv50.h"
/*******************************************************************************
@@ -432,6 +433,8 @@ nv84_fifo_ctor(struct nouveau_object *parent, struct nouveau_object *engine,
nv_subdev(priv)->intr = nv04_fifo_intr;
nv_engine(priv)->cclass = &nv84_fifo_cclass;
nv_engine(priv)->sclass = nv84_fifo_sclass;
+ priv->base.pause = nv04_fifo_pause;
+ priv->base.start = nv04_fifo_start;
return 0;
}
OpenPOWER on IntegriCloud