Should be fixed by:

https://github.com/skeggsb/nouveau/commit/c122b4b8854c3ac7d1d5a8fd902b54e9e42a27ac

Ben -- probably worth backporting...