i965: Merge gen7_clip_state atom into gen6_clip_state atom.