[git pull] drm/vgaarb fixes