[git pull] drm i915 fixes