From 0dc58c10f9a1bcc377940f3d06432883d887db0f Mon Sep 17 00:00:00 2001 From: Ben Skeggs Date: Tue, 1 May 2012 16:39:08 +1000 Subject: [PATCH] --- yaml --- r: 307553 b: refs/heads/master c: 7f2062e9de357e4158645b72b472ccba229cb3aa h: refs/heads/master i: 307551: 40d3b4d4c3659ad43d4c1817b4ec373f1e07c539 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/nouveau/nv50_graph.c | 6 ------ trunk/drivers/gpu/drm/nouveau/nv50_mpeg.c | 1 - trunk/drivers/gpu/drm/nouveau/nva3_copy.c | 7 ------- 4 files changed, 1 insertion(+), 15 deletions(-) diff --git a/[refs] b/[refs] index a509c314da12..1098585ed08e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 03bd6efa1468830d1dc9380654229d427aa487d7 +refs/heads/master: 7f2062e9de357e4158645b72b472ccba229cb3aa diff --git a/trunk/drivers/gpu/drm/nouveau/nv50_graph.c b/trunk/drivers/gpu/drm/nouveau/nv50_graph.c index d262e31c2830..6fe5962c4393 100644 --- a/trunk/drivers/gpu/drm/nouveau/nv50_graph.c +++ b/trunk/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/trunk/drivers/gpu/drm/nouveau/nv50_mpeg.c b/trunk/drivers/gpu/drm/nouveau/nv50_mpeg.c index b57a2d180ad2..95c3305b54c6 100644 --- a/trunk/drivers/gpu/drm/nouveau/nv50_mpeg.c +++ b/trunk/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/trunk/drivers/gpu/drm/nouveau/nva3_copy.c b/trunk/drivers/gpu/drm/nouveau/nva3_copy.c index 8f356d58e409..b63ef87173a6 100644 --- a/trunk/drivers/gpu/drm/nouveau/nva3_copy.c +++ b/trunk/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; }