[git pull] drm fixes for v4.12-rc4