diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2011-07-20 03:22:33 +0200 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2011-07-25 01:43:22 +0200 |
| commit | 6c320fef5835240bf414b54e697e517a160663f4 (patch) | |
| tree | 791f610df2eef6e7534fb23099a29a41dd508329 /drivers/gpu/drm/nouveau/nv20_graph.c | |
| parent | drm/nouveau: replace nv04_graph_fifo_access() use with direct reg bashing (diff) | |
| download | linux-6c320fef5835240bf414b54e697e517a160663f4.tar.xz linux-6c320fef5835240bf414b54e697e517a160663f4.zip | |
drm/nouveau: pass flag to engine fini() method on suspend
It may not be necessary to fail in certain cases (such as failing to idle)
on module unload, whereas on suspend it's important to ensure a consistent
state can be restored on resume.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nv20_graph.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nv20_graph.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nv20_graph.c b/drivers/gpu/drm/nouveau/nv20_graph.c index 3791222f20b9..a54b7d9e7e26 100644 --- a/drivers/gpu/drm/nouveau/nv20_graph.c +++ b/drivers/gpu/drm/nouveau/nv20_graph.c @@ -654,7 +654,7 @@ nv30_graph_init(struct drm_device *dev, int engine) } int -nv20_graph_fini(struct drm_device *dev, int engine) +nv20_graph_fini(struct drm_device *dev, int engine, bool suspend) { nv20_graph_unload_context(dev); nv_wr32(dev, NV03_PGRAPH_INTR_EN, 0x00000000); |