More state management changes:

- Don't lock in savageDDUpdateStatte, don't call savageEmitHwStateLocked
- Need to grab the lock for texture uploads now
- New SAVAGE_NEW_CULL bit in new_state to make sure that culling state and
  raster_primitive are not examined at the wrong times.

1 files changed, 2 insertions, 0 deletions

diff --git a/src/mesa/drivers/dri/savage/savagetex.c b/src/mesa/drivers/dri/savage/savagetex.c
index 69cb5b88664..aabf6f1280c 100644
--- a/src/mesa/drivers/dri/savage/savagetex.c
+++ b/src/mesa/drivers/dri/savage/savagetex.c
@@ -791,6 +791,7 @@ int savageUploadTexImages( savageContextPtr imesa, savageTextureObjectPtr t )
    savageUpdateTexLRU( imesa, t );
 
    if (t->dirty_images) {
+      LOCK_HARDWARE(imesa);
       savageFlushVerticesLocked (imesa);
       savageDmaFinish (imesa);
       if (SAVAGE_DEBUG & DEBUG_VERBOSE_LRU)
@@ -799,6 +800,7 @@ int savageUploadTexImages( savageContextPtr imesa, savageTextureObjectPtr t )
       for (i = t->min_level ; i <= t->max_level ; i++)
 	 if (t->dirty_images & (1<<i)) 
 	    savageUploadTexLevel( t, i );
+      UNLOCK_HARDWARE(imesa);
    }