[xorg-x11-drv-nvidia/f31] (3 commits) ...Simplify