More updates for 1.20.2

This series adds the no-glamor-on-llvmpipe changes, and the fix to the non-pci fbdev probe logic.