summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Airlie <airlied@gmail.com>2015-09-13 07:45:15 +1000
committerAdam Jackson <ajax@redhat.com>2015-10-21 15:13:41 -0400
commitc99fb550e06207e83ec89463fe32bd6bceca45f8 (patch)
treedf96a3e8de33fae0e50b48a36bc2efa22f71d798
parent912f1fe2bb1b640d55fc44fcf636b6ca40d7f40b (diff)
xf86: don't add gpus from udev if autoAddGPU is set
At startup the server wasn't adding devices, but nothing was blocking hotplug devices by the look of it. bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=91388 Signed-off-by: Dave Airlie <airlied@redhat.com> Reviewed-by: Hans de Goede <hdegoede@redhat.com>
-rw-r--r--hw/xfree86/common/xf86platformBus.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/hw/xfree86/common/xf86platformBus.c b/hw/xfree86/common/xf86platformBus.c
index f1e942378..96895a6e1 100644
--- a/hw/xfree86/common/xf86platformBus.c
+++ b/hw/xfree86/common/xf86platformBus.c
@@ -477,6 +477,9 @@ xf86platformAddDevice(int index)
screenLayoutPtr layout;
static const char *hotplug_driver_name = "modesetting";
+ if (!xf86Info.autoAddGPU)
+ return -1;
+
/* force load the driver for now */
xf86LoadOneModule(hotplug_driver_name, NULL);