[git pull] drm fixes for final