From 48b5eaf303b60077faed09db77785d7a544ac335 Mon Sep 17 00:00:00 2001
From: Thomas Hellstrom <thomas-at-tungstengraphics-dot-com>
Date: Sat, 20 Oct 2007 16:49:43 +0200
Subject: Simple replacement for hardware lock in some cases. Fix i915 since
 last commit.

---
 shared-core/drm.h      | 1 +
 shared-core/i915_dma.c | 1 +
 2 files changed, 2 insertions(+)

(limited to 'shared-core')

diff --git a/shared-core/drm.h b/shared-core/drm.h
index 0ffd0ad5..f88192ff 100644
--- a/shared-core/drm.h
+++ b/shared-core/drm.h
@@ -872,6 +872,7 @@ struct drm_bo_op_arg {
 
 struct drm_mm_type_arg {
 	unsigned int mem_type;
+        int lock_unlock_bm;
 };
 
 struct drm_mm_init_arg {
diff --git a/shared-core/i915_dma.c b/shared-core/i915_dma.c
index 5a51f6ef..99d98cd3 100644
--- a/shared-core/i915_dma.c
+++ b/shared-core/i915_dma.c
@@ -930,6 +930,7 @@ int i915_validate_buffer_list(struct drm_file *file_priv,
 						 req->bo_req.flags,
 						 req->bo_req.mask,
 						 req->bo_req.hint,
+						 0,
 						 &rep.bo_info,
 						 &buffers[buf_count]);
 
-- 
cgit v1.2.3