i965: Move some code from gen7_sol_state.c to gen6_sol.c.