xorg-server: Changes to 'ubuntu-quantal'
debian/changelog | 13 +
debian/patches/236-use-fbdev-for-poulsbo-oaktrail-medfield.patch | 88 ++++++++++
debian/patches/237-dix-set-the-device-transformation-matrix.patch | 42 ++++
debian/patches/series | 2
4 files changed, 143 insertions(+), 2 deletions(-)
New commits:
commit 1b68c17c0c91b427d33217f124a889131a0dc1c3
Author: Bryce Harrington <bryce@canonical.com>
Date: Wed Nov 21 14:19:08 2012 -0800
SRU latest raring change to quantal
diff --git a/debian/changelog b/debian/changelog
index 105864d..05eb38e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg-server (2:1.13.0-0ubuntu6.1) raring; urgency=low
+xorg-server (2:1.13.0-0ubuntu6.1) quantal-proposed; urgency=low
[ Maarten Lankhorst ]
* add 233-xf86events-valgrind.patch to fix a xserver corruption
@@ -18,7 +18,7 @@ xorg-server (2:1.13.0-0ubuntu6.1) raring; urgency=low
* 500_pointer_barrier_thresholds.diff: Update to fix gaps above
barriers at edge of screen (LP: #1073724)
- -- Timo Aaltonen <tjaalton@ubuntu.com> Tue, 09 Oct 2012 10:22:24 +0300
+ -- Bryce Harrington <bryce@ubuntu.com> Fri, 16 Nov 2012 15:56:23 -0800
xorg-server (2:1.13.0-0ubuntu6) quantal; urgency=low
commit 4af1d9adbb515e2c9d01c514fbaf7a81ad3a225c
Author: Bryce Harrington <bryce@canonical.com>
Date: Fri Nov 16 15:45:46 2012 -0800
SRU patches 236 and 237 from raring
diff --git a/debian/changelog b/debian/changelog
index 564405c..105864d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,19 @@
-xorg-server (2:1.13.0-0ubuntu6.1) UNRELEASED; urgency=low
+xorg-server (2:1.13.0-0ubuntu6.1) raring; urgency=low
[ Maarten Lankhorst ]
* add 233-xf86events-valgrind.patch to fix a xserver corruption
when acpid is stopped before Xorg is. (LP: #1070481)
* add 235-composite-tracking.diff to fix exa corruption. (LP: #1010794)
+ [ Bryce Harrington ]
+ * Add 236-use-fbdev-for-poulsbo-oaktrail-medfield.patch: Never use Intel
+ driver on Poulsbo/Oaktrail/Medfield. Thanks to Matthias Klumpp.
+ (LP: #1069031)
+ * Add 237-dix-set-the-device-transformation-matrix.patch: Fix pointer
+ jumping with absolute pointing device. Initializes device
+ transformation matrix to an identity matrix. Thanks to a7x.
+ (LP: #1041063)
+
[ Tim Lunn ]
* 500_pointer_barrier_thresholds.diff: Update to fix gaps above
barriers at edge of screen (LP: #1073724)
diff --git a/debian/patches/236-use-fbdev-for-poulsbo-oaktrail-medfield.patch b/debian/patches/236-use-fbdev-for-poulsbo-oaktrail-medfield.patch
new file mode 100644
index 0000000..dbf210d
--- /dev/null
+++ b/debian/patches/236-use-fbdev-for-poulsbo-oaktrail-medfield.patch
@@ -0,0 +1,88 @@
+From ec3ce5493ec00ca0a9304b705a58a40e364f88fb Mon Sep 17 00:00:00 2001
+From: Stefan Dirsch <sndirsch@suse.de>
+Date: Sun, 22 Jul 2012 12:29:51 +0200
+Subject: [PATCH 3/3] Do not use intel driver on Poulsbo, Oaktrail, Medfield, CDV.
+
+IDs stolen from Kernel psb driver.
+---
+ hw/xfree86/common/xf86pciBus.c | 64 +++++++++++++++++++++++++++++++++++-----
+ 1 files changed, 56 insertions(+), 8 deletions(-)
+
+diff --git a/hw/xfree86/common/xf86pciBus.c b/hw/xfree86/common/xf86pciBus.c
+index a2c18eb..258988a 100644
+--- a/hw/xfree86/common/xf86pciBus.c
++++ b/hw/xfree86/common/xf86pciBus.c
+@@ -1147,14 +1147,62 @@ xf86VideoPtrToDriverList(struct pci_device *dev,
+ driverList[0] = "i128";
+ break;
+ case 0x8086:
+- if ((dev->device_id == 0x00d1) || (dev->device_id == 0x7800)) {
+- driverList[0] = "i740";
+- }
+- else if (dev->device_id == 0x8108) {
+- break; /* "hooray" for poulsbo */
+- }
+- else {
+- driverList[0] = "intel";
++ switch (dev->device_id)
++ {
++ /* Intel i740 */
++ case 0x00d1:
++ case 0x7800:
++ driverList[0] = "i740";
++ break;
++ /* GMA500/Poulsbo */
++ case 0x8108:
++ case 0x8109:
++ /* Try psb driver on Poulsbo - if available */
++ driverList[0] = "psb";
++ driverList[1] = "psb_drv";
++ break;
++ /* GMA600/Oaktrail */
++ case 0x4100:
++ case 0x4101:
++ case 0x4102:
++ case 0x4103:
++ case 0x4104:
++ case 0x4105:
++ case 0x4106:
++ case 0x4107:
++ /* Atom E620/Oaktrail */
++ case 0x4108:
++ /* Medfield */
++ case 0x0130:
++ case 0x0131:
++ case 0x0132:
++ case 0x0133:
++ case 0x0134:
++ case 0x0135:
++ case 0x0136:
++ case 0x0137:
++ /* GMA 3600/CDV */
++ case 0x0be0:
++ case 0x0be1:
++ case 0x0be2:
++ case 0x0be3:
++ case 0x0be4:
++ case 0x0be5:
++ case 0x0be6:
++ case 0x0be7:
++ case 0x0be8:
++ case 0x0be9:
++ case 0x0bea:
++ case 0x0beb:
++ case 0x0bec:
++ case 0x0bed:
++ case 0x0bee:
++ case 0x0bef:
++ /* Use fbdev/vesa driver on Oaktrail, Medfield, CDV */
++ break;
++ default:
++ driverList[0] = "intel";
++ break;
+ }
+ break;
+ case 0x102b:
+--
+1.7.3.4
+
diff --git a/debian/patches/237-dix-set-the-device-transformation-matrix.patch b/debian/patches/237-dix-set-the-device-transformation-matrix.patch
new file mode 100644
index 0000000..92a9f57
--- /dev/null
+++ b/debian/patches/237-dix-set-the-device-transformation-matrix.patch
@@ -0,0 +1,42 @@
+From 3d1051aecbb1955084804133cacd12c7f696833a Mon Sep 17 00:00:00 2001
+From: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Thu, 20 Sep 2012 05:56:39 +1000
+Subject: [PATCH] dix: set the device transformation matrix
+
+The property handler is registered after setting the property, so
+dev->transform remains as all-zeros. That causes pixman_f_transform_invert()
+to fail (in transformAbsolute()) and invert remains as garbage. This
+may then cause a cursor jump to 0,0.
+
+Since the axes are not yet initialized here and we need to allow for drivers
+changing the matrix, we cannot use the property handler for matrix
+initialization, essentially duplicating the code.
+
+Triggered by the fix to (#49347) in 749a593e49adccdf1225be28a521412ec85333f4
+
+https://bugzilla.redhat.com/show_bug.cgi?id=852841
+
+Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+Reviewed-by: Chase Douglas <chase.douglas@ubuntu.com>
+Signed-off-by: Keith Packard <keithp@keithp.com>
+---
+ dix/devices.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/dix/devices.c b/dix/devices.c
+index 9cf04ed..66d4406 100644
+--- a/dix/devices.c
++++ b/dix/devices.c
+@@ -306,6 +306,9 @@ AddInputDevice(ClientPtr client, DeviceProc deviceProc, Bool autoStart)
+ /* unity matrix */
+ memset(transform, 0, sizeof(transform));
+ transform[0] = transform[4] = transform[8] = 1.0f;
++ dev->transform.m[0][0] = 1.0;
++ dev->transform.m[1][1] = 1.0;
++ dev->transform.m[2][2] = 1.0;
+
+ XIChangeDeviceProperty(dev, XIGetKnownProperty(XI_PROP_TRANSFORM),
+ XIGetKnownProperty(XATOM_FLOAT), 32,
+--
+1.7.11.3
+
diff --git a/debian/patches/series b/debian/patches/series
index a124241..0065af3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -26,6 +26,7 @@
233-xf86events-valgrind.patch
#234-composite-borderclip.patch
235-composite-tracking.diff
+236-use-fbdev-for-poulsbo-oaktrail-medfield.patch
## waiting for review by upstream
111_armel-drv-fallbacks.patch
@@ -35,3 +36,4 @@
229_udev-fix.diff
230-fix-compat-output-selection.patch
231-scan-pci-after-probing-devices.patch
+237-dix-set-the-device-transformation-matrix.patch
Reply to: