There was a logical split in this series at patch 8-9, but I figured I should share the final result as well since people are probably wondering why I care, and I'm hoping to land this all for the next libdrm release (which we need to do for the updated header, which we need for mesa).