From c5f158abbe97492f56eb60ac54679945e9d6ddae Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@optimus.(none)>
Date: Thu, 25 Oct 2007 16:52:33 +1000
Subject: i915: remove relocatee kernel mapping sooner stops mutex taking
 during sleep

---
 shared-core/i915_dma.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'shared-core')

diff --git a/shared-core/i915_dma.c b/shared-core/i915_dma.c
index eb8c9153..acbb41dc 100644
--- a/shared-core/i915_dma.c
+++ b/shared-core/i915_dma.c
@@ -864,6 +864,9 @@ int i915_process_relocs(struct drm_file *file_priv,
 
 	} while (reloc_offset != reloc_end);
 out:
+	drm_bo_kunmap(&relocatee->kmap);
+	relocatee->data_page = NULL;
+
 	drm_bo_kunmap(&reloc_kmap);
 
 	mutex_lock(&dev->struct_mutex);
@@ -901,7 +904,6 @@ static int i915_exec_reloc(struct drm_file *file_priv, drm_handle_t buf_handle,
 		}
 	}
 	
-	drm_bo_kunmap(&relocatee.kmap);
 	mutex_lock(&dev->struct_mutex);
 	drm_bo_usage_deref_locked(&relocatee.buf);
 	mutex_unlock(&dev->struct_mutex);
-- 
cgit v1.2.3