From ee417ddc5c3b1dace33ee37c49b53fb2d502f585 Mon Sep 17 00:00:00 2001
From: Francisco Jerez <currojerez@riseup.net>
Date: Mon, 25 Oct 2010 23:38:59 +0200
Subject: [PATCH] --- yaml --- r: 228559 b: refs/heads/master c:
 e419cf0954901bb3a987f8b76cbc9654ca06121c h: refs/heads/master i:   228557:
 bb7437e7b20ca86f1c7e9500e1ecc0214ae0dfd8   228555:
 a97bd8d1b3f3b00e4ba2d6e98cea594961a32154   228551:
 bba2c2c515ed851ee48755dd84ea305cf04a5792   228543:
 f9069dd61db00691708d31bf47495c001bafb4f8 v: v3

---
 [refs]                                      | 2 +-
 trunk/drivers/gpu/drm/nouveau/nouveau_bo.c  | 2 +-
 trunk/drivers/gpu/drm/nouveau/nouveau_drv.h | 5 +++++
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 03bc04efb5e2..49011ecdbadb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1f6d2de2c539df6fe52ad2187191a9dfe10c7233
+refs/heads/master: e419cf0954901bb3a987f8b76cbc9654ca06121c
diff --git a/trunk/drivers/gpu/drm/nouveau/nouveau_bo.c b/trunk/drivers/gpu/drm/nouveau/nouveau_bo.c
index cdc8f544d47f..099f806f39ed 100644
--- a/trunk/drivers/gpu/drm/nouveau/nouveau_bo.c
+++ b/trunk/drivers/gpu/drm/nouveau/nouveau_bo.c
@@ -678,7 +678,7 @@ nouveau_bo_move_m2mf(struct ttm_buffer_object *bo, int evict, bool intr,
 	chan = nvbo->channel;
 	if (!chan || nvbo->no_vm) {
 		chan = dev_priv->channel;
-		mutex_lock(&chan->mutex);
+		mutex_lock_nested(&chan->mutex, NOUVEAU_KCHANNEL_MUTEX);
 	}
 
 	if (dev_priv->card_type < NV_50)
diff --git a/trunk/drivers/gpu/drm/nouveau/nouveau_drv.h b/trunk/drivers/gpu/drm/nouveau/nouveau_drv.h
index 5814db82f778..ce0475ead381 100644
--- a/trunk/drivers/gpu/drm/nouveau/nouveau_drv.h
+++ b/trunk/drivers/gpu/drm/nouveau/nouveau_drv.h
@@ -173,6 +173,11 @@ struct nouveau_page_flip_state {
 	uint64_t offset;
 };
 
+enum nouveau_channel_mutex_class {
+	NOUVEAU_UCHANNEL_MUTEX,
+	NOUVEAU_KCHANNEL_MUTEX
+};
+
 struct nouveau_channel {
 	struct drm_device *dev;
 	int id;