Add some fixups for 3.13 based i915, thanks Maarten Lankhorst