initial import of libdrm-2.4.58
merge libdrm 2.4.58.
fix a merge botch.