[git pull] drm fixes for 5.0-rc7