xorg-server: Changes to 'ubuntu'
debian/changelog | 21 ++++++++++++
debian/patches/111_armel-drv-fallbacks.patch | 46 ++++++++++++++++++++-------
2 files changed, 56 insertions(+), 11 deletions(-)
New commits:
commit 94599daf9beb3466ffd7b2835ba5a64ade8ae529
Author: Timo Aaltonen <tjaalton@ubuntu.com>
Date: Sun Aug 26 18:40:16 2012 +0300
release to quantal
* debian/patches/111_armel-drv-fallbacks.patch:
- Now that the modesetting is part of xserver-xorg-video-all, enable the
arm specific drivers before modesetting is included, otherwise it'll
always be the default, even if we have arm-compatible drivers available
at the system (LP: #1041686)
diff --git a/debian/changelog b/debian/changelog
index 1237f9a..1db652e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+xorg-server (2:1.12.99.905-0ubuntu3) quantal; urgency=low
+
+ * debian/patches/111_armel-drv-fallbacks.patch:
+ - Now that the modesetting is part of xserver-xorg-video-all, enable the
+ arm specific drivers before modesetting is included, otherwise it'll
+ always be the default, even if we have arm-compatible drivers available
+ at the system (LP: #1041686)
+
+ -- Ricardo Salveti de Araujo <ricardo.salveti@linaro.org> Sat, 25 Aug 2012 19:19:16 -0300
+
xorg-server (2:1.12.99.905-0ubuntu2) quantal; urgency=low
* debian/patches/111_armel-drv-fallbacks.patch:
diff --git a/debian/patches/111_armel-drv-fallbacks.patch b/debian/patches/111_armel-drv-fallbacks.patch
index 83c1d0c..bc76c4e 100644
--- a/debian/patches/111_armel-drv-fallbacks.patch
+++ b/debian/patches/111_armel-drv-fallbacks.patch
@@ -1,5 +1,5 @@
diff --git a/hw/xfree86/common/xf86AutoConfig.c b/hw/xfree86/common/xf86AutoConfig.c
-index 55412b4..058db0c 100644
+index 55412b4..d4a95d2 100644
--- a/hw/xfree86/common/xf86AutoConfig.c
+++ b/hw/xfree86/common/xf86AutoConfig.c
@@ -45,6 +45,12 @@
@@ -43,11 +43,12 @@ index 55412b4..058db0c 100644
static void
listPossibleVideoDrivers(char *matches[], int nmatches)
{
-@@ -297,6 +324,18 @@ listPossibleVideoDrivers(char *matches[], int nmatches)
- #if !defined(__linux__) && defined(__sparc__)
- matches[i++] = xnfstrdup("wsfb");
- #else
+@@ -287,6 +314,21 @@ listPossibleVideoDrivers(char *matches[], int nmatches)
+ #endif
+ }
+
+#if defined(__linux__) && defined(__arm__)
++ if (i < (nmatches - 1)) {
+ if (test_sysfs_device("mxc_gpu", "imx"))
+ matches[i++] = xnfstrdup("imx");
+ else if (test_sysfs_device("dovefb", "dovefb"))
@@ -58,10 +59,12 @@ index 55412b4..058db0c 100644
+ matches[i++] = xnfstrdup("omapfb");
+ else if (test_sysfs_device("omap", "pvr"))
+ matches[i++] = xnfstrdup("pvr");
++ }
+#endif /* defined(__linux__) && defined(__arm__) */
- matches[i++] = xnfstrdup("fbdev");
++
+ #if defined(__linux__)
+ matches[i++] = xnfstrdup("modesetting");
#endif
- }
diff --git a/hw/xfree86/common/xf86platformBus.c b/hw/xfree86/common/xf86platformBus.c
index 24b9473..0061c25 100644
--- a/hw/xfree86/common/xf86platformBus.c
commit a2bbb25a61df85540abdaec0d2bff913ad5d266f
Author: Timo Aaltonen <tjaalton@ubuntu.com>
Date: Thu Aug 23 16:55:34 2012 +0300
update 111_armel-drv-fallbacks.patch
* debian/patches/111_armel-drv-fallbacks.patch:
- Adding support for omapdrm based devices (using the omap xorg driver),
and make xorg to use the recently added platform probe functions, by
trying to probe the driver in case there's only one platform device
available and without a valid busID (case of Omap3 and Omap4 based
devices) (LP: #1040405)
diff --git a/debian/changelog b/debian/changelog
index a3f9a9f..1237f9a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+xorg-server (2:1.12.99.905-0ubuntu2) quantal; urgency=low
+
+ * debian/patches/111_armel-drv-fallbacks.patch:
+ - Adding support for omapdrm based devices (using the omap xorg driver),
+ and make xorg to use the recently added platform probe functions, by
+ trying to probe the driver in case there's only one platform device
+ available and without a valid busID (case of Omap3 and Omap4 based
+ devices) (LP: #1040405)
+
+ -- Ricardo Salveti de Araujo <ricardo.salveti@linaro.org> Thu, 23 Aug 2012 01:20:03 -0300
+
xorg-server (2:1.12.99.905-0ubuntu1) quantal; urgency=low
[ Robert Hooker ]
diff --git a/debian/patches/111_armel-drv-fallbacks.patch b/debian/patches/111_armel-drv-fallbacks.patch
index 1086e3b..83c1d0c 100644
--- a/debian/patches/111_armel-drv-fallbacks.patch
+++ b/debian/patches/111_armel-drv-fallbacks.patch
@@ -1,8 +1,8 @@
diff --git a/hw/xfree86/common/xf86AutoConfig.c b/hw/xfree86/common/xf86AutoConfig.c
-index 43c746b..08574a4 100644
+index 55412b4..058db0c 100644
--- a/hw/xfree86/common/xf86AutoConfig.c
+++ b/hw/xfree86/common/xf86AutoConfig.c
-@@ -44,6 +44,12 @@
+@@ -45,6 +45,12 @@
#include "xf86sbusBus.h"
#endif
@@ -15,7 +15,7 @@ index 43c746b..08574a4 100644
#ifdef sun
#include <sys/visual_io.h>
#include <ctype.h>
-@@ -188,6 +194,27 @@ xf86AutoConfig(void)
+@@ -200,6 +206,27 @@ xf86AutoConfig(void)
return ret == CONFIG_OK;
}
@@ -43,7 +43,7 @@ index 43c746b..08574a4 100644
static void
listPossibleVideoDrivers(char *matches[], int nmatches)
{
-@@ -276,6 +303,16 @@ listPossibleVideoDrivers(char *matches[], int nmatches)
+@@ -297,6 +324,18 @@ listPossibleVideoDrivers(char *matches[], int nmatches)
#if !defined(__linux__) && defined(__sparc__)
matches[i++] = xnfstrdup("wsfb");
#else
@@ -52,11 +52,32 @@ index 43c746b..08574a4 100644
+ matches[i++] = xnfstrdup("imx");
+ else if (test_sysfs_device("dovefb", "dovefb"))
+ matches[i++] = xnfstrdup("dovefb");
-+ else if (test_sysfs_device("omap", "pvr"))
-+ matches[i++] = xnfstrdup("pvr");
++ else if (test_sysfs_device("omapdrm", "omap"))
++ matches[i++] = xnfstrdup("omap");
+ else if (test_sysfs_device("omapfb", "omapfb"))
+ matches[i++] = xnfstrdup("omapfb");
++ else if (test_sysfs_device("omap", "pvr"))
++ matches[i++] = xnfstrdup("pvr");
+#endif /* defined(__linux__) && defined(__arm__) */
matches[i++] = xnfstrdup("fbdev");
#endif
}
+diff --git a/hw/xfree86/common/xf86platformBus.c b/hw/xfree86/common/xf86platformBus.c
+index 24b9473..0061c25 100644
+--- a/hw/xfree86/common/xf86platformBus.c
++++ b/hw/xfree86/common/xf86platformBus.c
+@@ -362,6 +362,14 @@ xf86platformProbeDev(DriverPtr drvp)
+ if (xf86IsPrimaryPlatform(&xf86_platform_devices[j]))
+ break;
+ }
++ else {
++ /* there's no way to handle real platform devices at this point,
++ * as there's no valid busID to be used, so try to move forward
++ * in case there's only one platform device, and see if the
++ * driver's probe succeeds or not at least once */
++ if ((xf86_num_platform_devices == 1) && (!foundScreen))
++ break;
++ }
+ }
+ }
+
Reply to: