Mesa (master): i965: revert part of commit 4f4907d69f9020ce17aef21b6431d2dd65e01982

[Brian Paul]

Module: Mesa
Branch: master
Commit: a9a363f8298e9d534e60e3d2869f8677138a1e7e
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=a9a363f8298e9d534e60e3d2869f8677138a1e7e

Author: Brian Paul <brianp at vmware.com>
Date:   Thu Apr 23 17:41:23 2009 -0600

i965: revert part of commit 4f4907d69f9020ce17aef21b6431d2dd65e01982

The drm_intel_gem_bo_map_gtt() call that replaced dri_bo_map() is
producing errors like:

intel_bufmgr_gem.c:689: Error preparing buffer map 39 (vp_const_buffer): Invalid argument .

and returning NULL, causing a segfault in the memcpy().

Just reverting until we can get to the root issue...

---

 src/mesa/drivers/dri/i965/brw_curbe.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/mesa/drivers/dri/i965/brw_curbe.c b/src/mesa/drivers/dri/i965/brw_curbe.c
index 0337156..18b187e 100644
--- a/src/mesa/drivers/dri/i965/brw_curbe.c
+++ b/src/mesa/drivers/dri/i965/brw_curbe.c
@@ -353,10 +353,10 @@ update_constant_buffer(struct brw_context *brw,
       assert(const_buffer);
       assert(const_buffer->size >= size);
 
-      drm_intel_gem_bo_map_gtt(const_buffer);
+      dri_bo_map(const_buffer, GL_TRUE);
       map = const_buffer->virtual;
       memcpy(map, params->ParameterValues, size);
-      drm_intel_gem_bo_unmap_gtt(const_buffer);
+      dri_bo_unmap(const_buffer);
 
       if (0) {
          int i;