Revert "Revert "Merge branch 'drm-gem'""

This reverts commit 7c81124d7c.
2008-08-24 17:59:10 +10:00
parent 7c81124d7c
commit f75843a517
76 changed files with 1744 additions and 4283 deletions
--- a/src/mesa/drivers/dri/intel/intel_buffers.c
+++ b/src/mesa/drivers/dri/intel/intel_buffers.c
@@ -819,6 +819,8 @@ intelSwapBuffers(__DRIdrawablePrivate * dPriv)

 	 intel_fb->swap_ust = ust;
      }
+      drmCommandNone(intel->driFd, DRM_I915_GEM_THROTTLE);
+
   }
   else {
      /* XXX this shouldn't be an error but we can't handle it for now */