Created attachment 132157 [details] [review]
fix

FTR, attaching the fix. However I don't know when I get it sent to the ML
because I can't finish piglit testing — GPU hangs.