diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2012-05-01 16:39:08 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2012-05-24 16:56:07 +1000 |
| commit | 7f2062e9de357e4158645b72b472ccba229cb3aa (patch) | |
| tree | ba756779daa12146fd5016965da0b24eaf497213 /drivers/gpu/drm/nouveau/nv50_graph.c | |
| parent | 03bd6efa1468830d1dc9380654229d427aa487d7 (diff) | |
| download | op-kernel-dev-7f2062e9de357e4158645b72b472ccba229cb3aa.zip op-kernel-dev-7f2062e9de357e4158645b72b472ccba229cb3aa.tar.gz | |
drm/nv50: remove execution engine context saves on suspend
Now triggered automagically by the GPU on PFIFO takedown.
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 | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/gpu/drm/nouveau/nv50_graph.c b/drivers/gpu/drm/nouveau/nv50_graph.c index d262e31..6fe5962 100644 --- a/drivers/gpu/drm/nouveau/nv50_graph.c +++ b/drivers/gpu/drm/nouveau/nv50_graph.c @@ -210,12 +210,6 @@ 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; } |
