diff --git a/[refs] b/[refs]
index 63c375b94c3e..f6ffe7607e18 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7b4808bb6ee63c9cc9c9be5a52f0c7babfc50659
+refs/heads/master: 2cb3d3b6c64d37514fd8865748de66ff35a489af
diff --git a/trunk/drivers/gpu/drm/nouveau/nouveau_state.c b/trunk/drivers/gpu/drm/nouveau/nouveau_state.c
index b42e29d1935e..75e70022fbd3 100644
--- a/trunk/drivers/gpu/drm/nouveau/nouveau_state.c
+++ b/trunk/drivers/gpu/drm/nouveau/nouveau_state.c
@@ -437,6 +437,7 @@ static int nouveau_init_engine_ptrs(struct drm_device *dev)
 			engine->crypt.takedown	= nv84_crypt_fini;
 			engine->crypt.create_context = nv84_crypt_create_context;
 			engine->crypt.destroy_context = nv84_crypt_destroy_context;
+			engine->crypt.tlb_flush	= nv84_crypt_tlb_flush;
 			break;
 		default:
 			engine->crypt.init	= nouveau_stub_init;
diff --git a/trunk/drivers/gpu/drm/nouveau/nv84_crypt.c b/trunk/drivers/gpu/drm/nouveau/nv84_crypt.c
index 1cda0240f55d..780bb1d66f95 100644
--- a/trunk/drivers/gpu/drm/nouveau/nv84_crypt.c
+++ b/trunk/drivers/gpu/drm/nouveau/nv84_crypt.c
@@ -61,7 +61,7 @@ nv84_crypt_destroy_context(struct nouveau_channel *chan)
 	struct drm_device *dev = chan->dev;
 	u32 inst;
 
-	if (!chan->ramin)
+	if (!chan->crypt_ctx)
 		return;
 
 	inst  = (chan->ramin->vinst >> 12);