[git pull] drm fixes (resend + one patch)