r600: move non-surface related cb state to general state