i965/wm/gen6: Refactor state setup