[git pull] drm fixes for 4.17-rc4