Created attachment 17856 [details] [review]
For commit 6ac352f146bafe3b4bb5832340eb0ccb730565d2, a better fix exists. Included patch is cleaner and removes an unnecessary variable.
I hope to keep assert as it's.
Matt, we have a intel-gfx mail list on fd.o, which is an ideal place for us to review patches and comments. I don't think this cleanup is really needed, and assert in that place can give us safe-guard. You may send patch to that list, maybe others will have more comments. Bugzilla is not good for patch review, so I close this one. Thanks.