[git pull] more drm fixes