From 0e34dcc6dfb466537f0e74d6c267d2f8bf795b66 Mon Sep 17 00:00:00 2001
From: "Xiang, Haihao" <haihao.xiang@intel.com>
Date: Tue, 25 Mar 2008 17:29:08 +0800
Subject: [PATCH] intel: fix the issue "VBO: Cannot allocate memory for a BO"
 on 965 after merging intel_context.c from i915 and i965. fix bug# 15152.

---
 src/mesa/drivers/dri/i915/i830_vtbl.c      | 6 ++++++
 src/mesa/drivers/dri/i915/i915_vtbl.c      | 7 +++++++
 src/mesa/drivers/dri/intel/intel_context.c | 1 +
 3 files changed, 14 insertions(+)

diff --git a/src/mesa/drivers/dri/i915/i830_vtbl.c b/src/mesa/drivers/dri/i915/i830_vtbl.c
index 1f4bc91d77e..d1b07c5a2f2 100644
--- a/src/mesa/drivers/dri/i915/i830_vtbl.c
+++ b/src/mesa/drivers/dri/i915/i830_vtbl.c
@@ -666,6 +666,11 @@ i830_assert_not_dirty( struct intel_context *intel )
    assert(!get_dirty(state));
 }
 
+static void
+i830_note_unlock( struct intel_context *intel )
+{
+    /* nothing */
+}
 
 void
 i830InitVtbl(struct i830_context *i830)
@@ -681,4 +686,5 @@ i830InitVtbl(struct i830_context *i830)
    i830->intel.vtbl.render_start = i830_render_start;
    i830->intel.vtbl.render_prevalidate = i830_render_prevalidate;
    i830->intel.vtbl.assert_not_dirty = i830_assert_not_dirty;
+   i830->intel.vtbl.note_unlock = i830_note_unlock; 
 }
diff --git a/src/mesa/drivers/dri/i915/i915_vtbl.c b/src/mesa/drivers/dri/i915/i915_vtbl.c
index 40c5de26c63..94d70be441b 100644
--- a/src/mesa/drivers/dri/i915/i915_vtbl.c
+++ b/src/mesa/drivers/dri/i915/i915_vtbl.c
@@ -572,6 +572,12 @@ i915_assert_not_dirty( struct intel_context *intel )
    assert(!dirty);
 }
 
+static void
+i915_note_unlock( struct intel_context *intel )
+{
+    /* nothing */
+}
+
 
 void
 i915InitVtbl(struct i915_context *i915)
@@ -587,4 +593,5 @@ i915InitVtbl(struct i915_context *i915)
    i915->intel.vtbl.update_texture_state = i915UpdateTextureState;
    i915->intel.vtbl.flush_cmd = i915_flush_cmd;
    i915->intel.vtbl.assert_not_dirty = i915_assert_not_dirty;
+   i915->intel.vtbl.note_unlock = i915_note_unlock; 
 }
diff --git a/src/mesa/drivers/dri/intel/intel_context.c b/src/mesa/drivers/dri/intel/intel_context.c
index 46c53ba4c2e..e2388dbb09a 100644
--- a/src/mesa/drivers/dri/intel/intel_context.c
+++ b/src/mesa/drivers/dri/intel/intel_context.c
@@ -993,6 +993,7 @@ void LOCK_HARDWARE( struct intel_context *intel )
  */
 void UNLOCK_HARDWARE( struct intel_context *intel )
 {
+   intel->vtbl.note_unlock( intel );
    intel->locked = 0;
 
    DRM_UNLOCK(intel->driFd, intel->driHwLock, intel->hHWContext);
-- 
2.30.2