|
 |
70130e |
From 9354bdf25ce2c265f65c52610e0f21cd8267cc44 Mon Sep 17 00:00:00 2001
|
|
|
70130e |
From: Ray Strode <rstrode@redhat.com>
|
|
|
70130e |
Date: Wed, 2 Oct 2013 12:38:45 -0400
|
|
|
70130e |
Subject: [PATCH] xfree86: Only look at wayland-capable drivers when -wayland
|
|
|
70130e |
given
|
|
|
70130e |
|
|
|
70130e |
There's no particularly good reason to support mixing wayland and
|
|
|
70130e |
non-wayland screens in the same Xorg instance, and it probably doesn't
|
|
|
70130e |
work correctly, so let's prevent people from injuring themselves.
|
|
|
70130e |
|
|
|
70130e |
Reviewed-by: Adam Jackson <ajax@redhat.com>
|
|
|
70130e |
Signed-off-by: Ray Strode <rstrode@redhat.com>
|
|
|
70130e |
---
|
|
|
70130e |
hw/xfree86/common/xf86Init.c | 20 ++++++++++----------
|
|
|
70130e |
1 file changed, 10 insertions(+), 10 deletions(-)
|
|
|
70130e |
|
|
|
70130e |
diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
|
|
|
70130e |
index a5a7daf..a40ed64 100644
|
|
|
70130e |
--- a/hw/xfree86/common/xf86Init.c
|
|
|
70130e |
+++ b/hw/xfree86/common/xf86Init.c
|
|
|
70130e |
@@ -550,26 +550,26 @@ InitOutput(ScreenInfo * pScreenInfo, int argc, char **argv)
|
|
|
70130e |
xf86DriverList[i]->driverFunc(NULL,
|
|
|
70130e |
GET_REQUIRED_HW_INTERFACES,
|
|
|
70130e |
&flags);
|
|
|
70130e |
-
|
|
|
70130e |
- if (NEED_IO_ENABLED(flags))
|
|
|
70130e |
- want_hw_access = TRUE;
|
|
|
70130e |
-
|
|
|
70130e |
- if (!(flags & HW_SKIP_CONSOLE))
|
|
|
70130e |
- xorgHWOpenConsole = TRUE;
|
|
|
70130e |
-
|
|
|
70130e |
if (xorgWayland) {
|
|
|
70130e |
- if (flags != HW_WAYLAND) {
|
|
|
70130e |
+ if (!(flags & HW_WAYLAND)) {
|
|
|
70130e |
xf86DeleteDriver(i);
|
|
|
70130e |
continue;
|
|
|
70130e |
}
|
|
|
70130e |
|
|
|
70130e |
want_hw_access = FALSE;
|
|
|
70130e |
xorgHWOpenConsole = FALSE;
|
|
|
70130e |
- }
|
|
|
70130e |
+
|
|
|
70130e |
+ } else {
|
|
|
70130e |
+ if (NEED_IO_ENABLED(flags))
|
|
|
70130e |
+ want_hw_access = TRUE;
|
|
|
70130e |
+
|
|
|
70130e |
+ if (!(flags & HW_SKIP_CONSOLE))
|
|
|
70130e |
+ xorgHWOpenConsole = TRUE;
|
|
|
70130e |
+ }
|
|
|
70130e |
}
|
|
|
70130e |
|
|
|
70130e |
for (i = 0; i < xf86NumDrivers; i++) {
|
|
|
70130e |
- if (xf86DriverList[i] == NULL) {
|
|
|
70130e |
+ while (xf86DriverList[i] == NULL) {
|
|
|
70130e |
for (j = i; j < xf86NumDrivers; j++) {
|
|
|
70130e |
xf86DriverList[j] = xf86DriverList[j + 1];
|
|
|
70130e |
}
|
|
|
70130e |
--
|
|
|
70130e |
1.8.3.1
|
|
|
70130e |
|