Created attachment 121578 [details] [review]
New avoid lockup patch

Latest version as posted to dri-devel.  With these two patches, your system
should no longer lockup forever.  It will freeze the game for a moment, and X
may die for other reasons.

Now the underlying tf2 issue needs investigation.