[git pull] drm i915 fixes for rc1