Merge branch 'drm-vmware-fixes' into drm-testing