repositories
/
deb_xorg-server.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ODROID-U3 xorg-server debian package fork :
[deb_xorg-server.git]
/
debian
/
patches
/
226_fall_back_to_autoconfiguration.patch
diff --git
a/debian/patches/226_fall_back_to_autoconfiguration.patch
b/debian/patches/226_fall_back_to_autoconfiguration.patch
index 70fa7e532c8be34e347a05c35451b69d8444bc9d..19514001df3da82c1274d54732836bf3d19305be 100644
(file)
--- a/
debian/patches/226_fall_back_to_autoconfiguration.patch
+++ b/
debian/patches/226_fall_back_to_autoconfiguration.patch
@@
-1,6
+1,6
@@
--- a/hw/xfree86/common/xf86Globals.c
+++ b/hw/xfree86/common/xf86Globals.c
--- a/hw/xfree86/common/xf86Globals.c
+++ b/hw/xfree86/common/xf86Globals.c
-@@ -16
1,6 +161,7 @@
+@@ -16
2,6 +162,7 @@ InputDriverPtr *xf86InputDriverList = NU
int xf86NumInputDrivers = 0;
int xf86NumScreens = 0;
int xf86NumGPUScreens = 0;
int xf86NumInputDrivers = 0;
int xf86NumScreens = 0;
int xf86NumGPUScreens = 0;
@@
-10,7
+10,7
@@
"StaticGray",
--- a/hw/xfree86/common/xf86Init.c
+++ b/hw/xfree86/common/xf86Init.c
"StaticGray",
--- a/hw/xfree86/common/xf86Init.c
+++ b/hw/xfree86/common/xf86Init.c
-@@ -48
1,20 +481,34 @@
+@@ -48
2,20 +482,34 @@ InitOutput(ScreenInfo * pScreenInfo, int
free(optionlist);
}
free(optionlist);
}
@@
-48,9
+48,9
@@
}
/* Load all input driver modules specified in the config file. */
}
/* Load all input driver modules specified in the config file. */
-@@ -55
4,8 +568,15 @@
- else
-
xf86Info.dontVTSwitch = TRUE
;
+@@ -55
7,8 +571,15 @@ InitOutput(ScreenInfo * pScreenInfo, int
+ if (want_hw_access)
+
xorgHWAccess = xf86EnableIO()
;
- if (xf86BusConfig() == FALSE)
- return;
- if (xf86BusConfig() == FALSE)
- return;
@@
-68,7
+68,7
@@
--- a/hw/xfree86/common/xf86Priv.h
+++ b/hw/xfree86/common/xf86Priv.h
--- a/hw/xfree86/common/xf86Priv.h
+++ b/hw/xfree86/common/xf86Priv.h
-@@ -89,6 +89,7 @@
+@@ -89,6 +89,7 @@
extern _X_EXPORT int xf86NumDrivers;
extern _X_EXPORT Bool xf86Resetting;
extern _X_EXPORT Bool xf86Initialising;
extern _X_EXPORT int xf86NumScreens;
extern _X_EXPORT Bool xf86Resetting;
extern _X_EXPORT Bool xf86Initialising;
extern _X_EXPORT int xf86NumScreens;