[git pull] drm fixes for 5.4-rc6