[git pull] drm fixes (try again)