[git pull] drm fixes for 4.16-rc5