[git pull] drm intel fixes and one nouveau regression