[git pull] final drm fixes