diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2011-07-20 05:44:52 +0400 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2011-07-25 03:43:38 +0400 |
| commit | 9962cc6eba013607d6199b723afca23301df7b47 (patch) | |
| tree | 2114c4aee75c09241f3935b02df0e1ff4113f171 /drivers/gpu/drm/nouveau/nv50_graph.c | |
| parent | 6c320fef5835240bf414b54e697e517a160663f4 (diff) | |
| download | linux-9962cc6eba013607d6199b723afca23301df7b47.tar.xz | |
drm/nouveau/gr: disable fifo access and idle before suspend ctx unload
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nv50_graph.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nv50_graph.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/nv50_graph.c b/drivers/gpu/drm/nouveau/nv50_graph.c index cce95dd99901..d27dcf0790de 100644 --- a/drivers/gpu/drm/nouveau/nv50_graph.c +++ b/drivers/gpu/drm/nouveau/nv50_graph.c @@ -256,6 +256,11 @@ nv50_graph_init(struct drm_device *dev, int engine) static int nv50_graph_fini(struct drm_device *dev, int engine, bool suspend) { + nv_mask(dev, 0x400500, 0x00010001, 0x00000000); + if (!nv_wait(dev, 0x400700, ~0, 0) && suspend) { + nv_mask(dev, 0x400500, 0x00010001, 0x00010001); + return -EBUSY; + } nv50_graph_unload_context(dev); nv_wr32(dev, 0x40013c, 0x00000000); return 0; |