[git pull] drm fixes for 4.13-rc7