Merge branch 'master' into i915-unification

Conflicts:

	src/mesa/drivers/dri/common/dri_drmpool.c
	src/mesa/drivers/dri/i915tex/i915_vtbl.c
	src/mesa/drivers/dri/i915tex/intel_batchbuffer.c
	src/mesa/drivers/dri/i915tex/intel_context.c

diff --cc src/mesa/drivers/dri/Makefile.template
Simple merge

diff --cc src/mesa/drivers/dri/i915tex/Makefile
Simple merge

diff --cc src/mesa/drivers/dri/i915tex/i830_vtbl.c
index dc91af7,b2a1ba0..eecff27
--- 1/src/mesa/drivers/dri/i915tex/i830_vtbl.c
--- 2/src/mesa/drivers/dri/i915tex/i830_vtbl.c
+++ b/src/mesa/drivers/dri/i915tex/i830_vtbl.c
@@@ -516,6 -524,16 +521,16 @@@ i830_emit_state(struct intel_context *i
  static void
  i830_destroy_context(struct intel_context *intel)
  {
 -       driBOUnReference(i830->state.tex_buffer[i]);
+    GLuint i;
+    struct i830_context *i830 = i830_context(&intel->ctx);
+ 
+    for (i = 0; i < I830_TEX_UNITS; i++) {
+       if (i830->state.tex_buffer[i] != NULL) {
++       dri_bo_unreference(i830->state.tex_buffer[i]);
+        i830->state.tex_buffer[i] = NULL;
+       }
+    }
+ 
     _tnl_free_vertices(&intel->ctx);
  }
  

diff --cc src/mesa/drivers/dri/i915tex/i915_context.h
Simple merge

diff --cc src/mesa/drivers/dri/i915tex/i915_metaops.c
Simple merge

diff --cc src/mesa/drivers/dri/i915tex/i915_vtbl.c
index 5d6ad8d,1d651a4..35757e1
--- 1/src/mesa/drivers/dri/i915tex/i915_vtbl.c
--- 2/src/mesa/drivers/dri/i915tex/i915_vtbl.c
+++ b/src/mesa/drivers/dri/i915tex/i915_vtbl.c
@@@ -426,6 -440,16 +437,16 @@@ i915_emit_state(struct intel_context *i
  static void
  i915_destroy_context(struct intel_context *intel)
  {
 -       driBOUnReference(i915->state.tex_buffer[i]);
+    GLuint i;
+    struct i915_context *i915 = i915_context(&intel->ctx);
+ 
+    for (i = 0; i < I915_TEX_UNITS; i++) {
+       if (i915->state.tex_buffer[i] != NULL) {
++       dri_bo_unreference(i915->state.tex_buffer[i]);
+        i915->state.tex_buffer[i] = NULL;
+       }
+    }
+ 
     _tnl_free_vertices(&intel->ctx);
  }
  

diff --cc src/mesa/drivers/dri/i915tex/intel_batchbuffer.c
index 5aabef9,c740c3d..5515d6c
--- 1/src/mesa/drivers/dri/i915tex/intel_batchbuffer.c
--- 2/src/mesa/drivers/dri/i915tex/intel_batchbuffer.c
+++ b/src/mesa/drivers/dri/i915tex/intel_batchbuffer.c
@@@ -194,12 -235,6 +192,12 @@@ do_flush_locked(struct intel_batchbuffe
        }
        intel->vtbl.lost_hardware(intel);
     }
-       i915_disasm(ptr, used / 4, batch->buf->offset);
 +
 +   if (INTEL_DEBUG & DEBUG_BATCH) {
 +      dri_bo_map(batch->buf, GL_FALSE);
++      intel_decode(ptr, used / 4, batch->buf->offset);
 +      dri_bo_unmap(batch->buf);
 +   }
  }
  
  

diff --cc src/mesa/drivers/dri/i915tex/intel_batchbuffer.h
Simple merge

diff --cc src/mesa/drivers/dri/i915tex/intel_context.c
index 3eb58bd,40ea756..16fbe38
--- 1/src/mesa/drivers/dri/i915tex/intel_context.c
--- 2/src/mesa/drivers/dri/i915tex/intel_context.c
+++ b/src/mesa/drivers/dri/i915tex/intel_context.c
@@@ -59,7 -59,6 +59,7 @@@
  #include "intel_regions.h"
  #include "intel_buffer_objects.h"
  #include "intel_fbo.h"
- #include "i915_disasm.h"
++#include "intel_decode.h"
  
  #include "drirenderbuffer.h"
  #include "vblank.h"
@@@ -658,18 -671,6 +669,18 @@@ intelContendedLock(struct intel_contex
     if (dPriv)
        DRI_VALIDATE_DRAWABLE_INFO(sPriv, dPriv);
  
-        i915_disasm_context_reset();
 +   /* If the last consumer of the texture memory wasn't us, notify the fake
 +    * bufmgr and record the new owner.  We should have the memory shared
 +    * between contexts of a single fake bufmgr, but this will at least make
 +    * things correct for now.
 +    */
 +   if (!intel->intelScreen->ttm && sarea->texAge != intel->hHWContext) {
 +      sarea->texAge = intel->hHWContext;
 +      dri_bufmgr_fake_contended_lock_take(intel->intelScreen->bufmgr);
 +      if (INTEL_DEBUG & DEBUG_BATCH)
++       intel_decode_context_reset();
 +   }
 +
     if (sarea->width != intelScreen->width ||
         sarea->height != intelScreen->height ||
         sarea->rotation != intelScreen->current_rotation) {

diff --cc src/mesa/drivers/dri/i915tex/intel_context.h
Simple merge

diff --cc src/mesa/drivers/dri/i915tex/intel_decode.c
index 292b6e3,6fc02c9..bf3387b
--- 1/src/mesa/drivers/dri/i915tex/i915_disasm.c
--- 2/src/mesa/drivers/dri/i915tex/intel_decode.c
+++ b/src/mesa/drivers/dri/i915tex/intel_decode.c
@@@ -815,7 -824,7 +824,7 @@@ intel_decode(uint32_t *data, int count
      return failures;
  }
  
- void i915_disasm_context_reset()
 -void intel_disasm_context_reset()
++void intel_decode_context_reset()
  {
      saved_s2_set = 0;
      saved_s4_set = 1;

diff --cc src/mesa/drivers/dri/i915tex/intel_pixel_draw.c
Simple merge

diff --cc src/mesa/drivers/dri/i915tex/server/i830_common.h
Simple merge

diff --cc src/mesa/drivers/dri/i965/intel_context.c
Simple merge