diff options
| author | Eric Anholt <[email protected]> | 2008-08-08 15:32:24 -0700 |
|---|---|---|
| committer | Eric Anholt <[email protected]> | 2008-08-08 15:32:24 -0700 |
| commit | 53675e5c05c0598b7ea206d5c27dbcae786a2c03 (patch) | |
| tree | d4bc5c9aa659b6b0e82245b0405ca740cc3d2a66 /src/mesa/drivers/dri/intel/intel_buffers.c | |
| parent | 501338d70e96e0388fd5198625d856c4ec07745f (diff) | |
| parent | d2796939f18815935c8fe1effb01fa9765d6c7d8 (diff) | |
Merge branch 'drm-gem'
Conflicts:
src/mesa/drivers/dri/intel/intel_span.c
src/mesa/main/fbobject.c
This converts the i915 driver to use the GEM interfaces for object management.
Diffstat (limited to 'src/mesa/drivers/dri/intel/intel_buffers.c')
| -rw-r--r-- | src/mesa/drivers/dri/intel/intel_buffers.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/mesa/drivers/dri/intel/intel_buffers.c b/src/mesa/drivers/dri/intel/intel_buffers.c index 75542a97758..77352e6a531 100644 --- 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 */ |