[upstream] Fix some kernel setting prompts in Xorg drivers