From 40d3b4d4c3659ad43d4c1817b4ec373f1e07c539 Mon Sep 17 00:00:00 2001
From: Ben Skeggs <bskeggs@redhat.com>
Date: Tue, 1 May 2012 16:12:32 +1000
Subject: [PATCH] --- yaml --- r: 307551 b: refs/heads/master c:
 71af5e62db5d7d6348e838d0f79533653e2f8cfe h: refs/heads/master i:   307549:
 fead6cef1a81b678b6a5f985330fda9e420f0f6d   307547:
 4a8350357ef0caf80e9f631532516e312fca165d   307543:
 29819985975b9c84d7e0bb9022b3edfe045be949   307535:
 2a0944f8fc8d9a46ab7a15cb439ead805bb4fce9   307519:
 1a881a7da1c92df2d8c5e7406f7db56f7c1ad533 v: v3

---
 [refs]                                     | 2 +-
 trunk/drivers/gpu/drm/nouveau/nv50_grctx.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index df812d602ff7..2d01f737a883 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 694931d20f41f9bf23f96ccae1b3a12a13ed54d9
+refs/heads/master: 71af5e62db5d7d6348e838d0f79533653e2f8cfe
diff --git a/trunk/drivers/gpu/drm/nouveau/nv50_grctx.c b/trunk/drivers/gpu/drm/nouveau/nv50_grctx.c
index 7ac7e6810966..881e22b249fc 100644
--- a/trunk/drivers/gpu/drm/nouveau/nv50_grctx.c
+++ b/trunk/drivers/gpu/drm/nouveau/nv50_grctx.c
@@ -210,7 +210,7 @@ nv50_grctx_generate(struct nouveau_grctx *ctx)
 	cp_name(ctx, cp_check_load);
 	cp_bra (ctx, AUTO_LOAD, PENDING, cp_setup_auto_load);
 	cp_bra (ctx, USER_LOAD, PENDING, cp_setup_load);
-	cp_bra (ctx, ALWAYS, TRUE, cp_exit);
+	cp_bra (ctx, ALWAYS, TRUE, cp_prepare_exit);
 
 	/* setup for context load */
 	cp_name(ctx, cp_setup_auto_load);