i915: remove relocatee kernel mapping sooner stops mutex taking during sleep

diff --git a/shared-core/i915_dma.c b/shared-core/i915_dma.c
index eb8c915..acbb41d 100644 (file)
--- 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);