From 8dd19ea794ff0898bb1647f059eda669d04ed667 Mon Sep 17 00:00:00 2001 From: Christoph Haag Date: Wed, 6 Apr 2022 23:23:23 +0200 Subject: [PATCH] st/prober: Also disable autoprober drivers when qwerty is enabled --- src/xrt/state_trackers/prober/p_prober.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/xrt/state_trackers/prober/p_prober.c b/src/xrt/state_trackers/prober/p_prober.c index b97372ac4..3ceb61aa8 100644 --- a/src/xrt/state_trackers/prober/p_prober.c +++ b/src/xrt/state_trackers/prober/p_prober.c @@ -351,6 +351,18 @@ disable_drivers_from_conflicts(struct prober *p) p->disabled_drivers[index] = (char *)p->entries[entry]->driver_name; } } + + for (size_t ap = 0; ap < XRT_MAX_AUTO_PROBERS; ap++) { + if (p->auto_probers[ap] == NULL) { + continue; + } + if (strcmp(p->auto_probers[ap]->name, "Qwerty") != 0) { + P_INFO(p, "Disabling %s because we have %s", p->auto_probers[ap]->name, "Qwerty"); + size_t index = p->num_disabled_drivers++; + U_ARRAY_REALLOC_OR_FREE(p->disabled_drivers, char *, p->num_disabled_drivers); + p->disabled_drivers[index] = (char *)p->auto_probers[ap]->name; + } + } return; }