[git pull] drm fixes round two for 5.13-rc1