Consistent lock order: display first, buffers second.
Consistent lock order: display first, buffers second.

tangent-opensource/coreBlackbird,tangent-opensource/coreBlackbird,tangent-opensource/coreBlackbird