JFYI, I replaced the fix from the reverting one to my submitted patch on SLE15/Leap15. It's still not included in 4.20, and I'll need to ping nouveau guys, but it's certainly closer to the upstream solution.