It wouldn't hurt if you could confirm whether downgrading to mesa 12 actually
makes the issue disappear or not. 

For as much, imo, locks are more likely to do with something in kernel. Stretch
has 4.9.. Perhaps you could try one of the latest 4.12rcs I guess?