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>

3 files changed, 0 insertions, 14 deletions

diff --git a/drivers/gpu/drm/nouveau/nv50_graph.c b/drivers/gpu/drm/nouveau/nv50_graph.c
index d262e31c2830..6fe5962c4393 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;
 }
diff --git a/drivers/gpu/drm/nouveau/nv50_mpeg.c b/drivers/gpu/drm/nouveau/nv50_mpeg.c
index b57a2d180ad2..95c3305b54c6 100644
--- a/drivers/gpu/drm/nouveau/nv50_mpeg.c
+++ b/drivers/gpu/drm/nouveau/nv50_mpeg.c
@@ -162,7 +162,6 @@ nv50_mpeg_init(struct drm_device *dev, int engine)
 static int
 nv50_mpeg_fini(struct drm_device *dev, int engine, bool suspend)
 {
-        /*XXX: context save for s/r */
         nv_mask(dev, 0x00b32c, 0x00000001, 0x00000000);
         nv_wr32(dev, 0x00b140, 0x00000000);
         return 0;
diff --git a/drivers/gpu/drm/nouveau/nva3_copy.c b/drivers/gpu/drm/nouveau/nva3_copy.c
index 8f356d58e409..b63ef87173a6 100644
--- a/drivers/gpu/drm/nouveau/nva3_copy.c
+++ b/drivers/gpu/drm/nouveau/nva3_copy.c
@@ -143,13 +143,6 @@ static int
 nva3_copy_fini(struct drm_device *dev, int engine, bool suspend)
 {
         nv_mask(dev, 0x104048, 0x00000003, 0x00000000);
-
-        /* trigger fuc context unload */
-        nv_wait(dev, 0x104008, 0x0000000c, 0x00000000);
-        nv_mask(dev, 0x104054, 0x40000000, 0x00000000);
-        nv_wr32(dev, 0x104000, 0x00000008);
-        nv_wait(dev, 0x104008, 0x00000008, 0x00000000);
-
         nv_wr32(dev, 0x104014, 0xffffffff);
         return 0;
 }