drm/i915: Reduce differences with Linux 3.8.13

No functional changes except small bugfixes.