Merge branch 'modesetting-dirty-libdrm'