fixup! i965/blorp: Merge into gen6_wm_state.
i965/blorp: Merge into gen7_ps_state.