diff options
author | Thomas Hellstrom <thomas-at-tungstengraphics-dot-com> | 2007-04-16 16:04:12 +0200 |
---|---|---|
committer | Thomas Hellstrom <thomas-at-tungstengraphics-dot-com> | 2007-04-16 16:04:12 +0200 |
commit | da56df9d722a2eb8223434d130436bcb6ea47188 (patch) | |
tree | 46bae3654d37cf286ab03df10de2a9e3ff776a25 /src/mesa/drivers/dri/i915tex/intel_buffer_objects.c | |
parent | 9519785e298c665f8aafe57a6a1b2d5c5d484a6d (diff) |
Make sure we are locked when creating drm buffer objects.
Don't place buffer objects on unfenced list when newly created.
Fix a buffer object wait-for-idle deadlock.
Diffstat (limited to 'src/mesa/drivers/dri/i915tex/intel_buffer_objects.c')
-rw-r--r-- | src/mesa/drivers/dri/i915tex/intel_buffer_objects.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/mesa/drivers/dri/i915tex/intel_buffer_objects.c b/src/mesa/drivers/dri/i915tex/intel_buffer_objects.c index ba3c7f0c1f..91c45ad95b 100644 --- a/src/mesa/drivers/dri/i915tex/intel_buffer_objects.c +++ b/src/mesa/drivers/dri/i915tex/intel_buffer_objects.c @@ -76,7 +76,9 @@ intel_bufferobj_release_region(struct intel_context *intel, */ driGenBuffers(intel->intelScreen->regionPool, "buffer object", 1, &intel_obj->buffer, 64, 0, 0); + LOCK_HARDWARE(intel); driBOData(intel_obj->buffer, intel_obj->Base.Size, NULL, 0); + UNLOCK_HARDWARE(intel); } /* Break the COW tie to the region. Both the pbo and the region end @@ -137,7 +139,9 @@ intel_bufferobj_data(GLcontext * ctx, if (intel_obj->region) intel_bufferobj_release_region(intel, intel_obj); + LOCK_HARDWARE(intel); driBOData(intel_obj->buffer, size, data, 0); + UNLOCK_HARDWARE(intel); } |