st/xorg: fix up xorg state tracker to use cso changes