As I mentiond in bug 55416 I received a new lockup due to VA being enabled,
however, the lockups only started occuring after commit
c8b06dccff9cb89e20378664f3cbc202876a180f.  Disabling VA also prevents the
lockups, so it may be similar to what was mentioned in comment 25.  I will
check if that piglit test still locks up for me.