[git pull] drm amdgpu and nouveau fixes for 4.18-rc6