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
/
xf86-fixup-detection.patch
diff --git
a/debian/patches/xf86-fixup-detection.patch
b/debian/patches/xf86-fixup-detection.patch
index e454c75a095b530f8f0c057c422aee9390a56b0c..495e65f913468f62af456e1b294c1a61152e5906 100644
(file)
--- a/
debian/patches/xf86-fixup-detection.patch
+++ b/
debian/patches/xf86-fixup-detection.patch
@@
-1,6
+1,6
@@
--- a/hw/xfree86/common/xf86pciBus.c
+++ b/hw/xfree86/common/xf86pciBus.c
--- a/hw/xfree86/common/xf86pciBus.c
+++ b/hw/xfree86/common/xf86pciBus.c
-@@ -546,6 +546,15 @@
+@@ -546,6 +546,15 @@
xf86PciProbeDev(DriverPtr drvp)
for (k = 0; k < xf86NumEntities; k++) {
EntityPtr pEnt = xf86Entities[k];
for (k = 0; k < xf86NumEntities; k++) {
EntityPtr pEnt = xf86Entities[k];
@@
-18,7
+18,7
@@
if (pEnt->bus.id.pci == pPci) {
--- a/hw/xfree86/common/xf86platformBus.c
+++ b/hw/xfree86/common/xf86platformBus.c
if (pEnt->bus.id.pci == pPci) {
--- a/hw/xfree86/common/xf86platformBus.c
+++ b/hw/xfree86/common/xf86platformBus.c
-@@ -167,11 +167,12 @@
+@@ -167,11 +167,12 @@
xf86_check_platform_slot(const struct xf
for (i = 0; i < xf86NumEntities; i++) {
const EntityPtr u = xf86Entities[i];
for (i = 0; i < xf86NumEntities; i++) {
const EntityPtr u = xf86Entities[i];
@@
-35,7
+35,7
@@
}
return TRUE;
}
}
return TRUE;
}
-@@ -302,6 +303,11 @@
+@@ -302,6 +303,11 @@
static Bool doPlatformProbe(struct xf86_
for (nent = 0; nent < xf86NumEntities; nent++) {
EntityPtr pEnt = xf86Entities[nent];
for (nent = 0; nent < xf86NumEntities; nent++) {
EntityPtr pEnt = xf86Entities[nent];
@@
-47,7
+47,7
@@
if (pEnt->bus.type != BUS_PLATFORM)
continue;
if (pEnt->bus.id.plat == dev) {
if (pEnt->bus.type != BUS_PLATFORM)
continue;
if (pEnt->bus.id.plat == dev) {
-@@ -368,18 +374,15 @@
+@@ -368,18 +374,15 @@
xf86platformProbeDev(DriverPtr drvp)
/* for non-seat0 servers assume first device is the master */
if (ServerIsNotSeat0())
break;
/* for non-seat0 servers assume first device is the master */
if (ServerIsNotSeat0())
break;
@@
-69,7
+69,7
@@
}
}
}
}
-@@ -398,6 +401,7 @@
+@@ -398,6 +401,7 @@
xf86platformProbeDev(DriverPtr drvp)
}
}
}
}