i915: Fix up state changes for i8xx.