i965/blorp: Merge into gen7_sol_state.