Merge lp:~bkerensa/ubuntu/quantal/xorg-server/quantal-proposed-1104209 into lp:ubuntu/quantal/xorg-server

[Benjamin Kerensa]

[Bryce Harrington (bryce)]

Hi Benjamin, thanks for packaging this patch and preparing the SRU. A few things need fixed though:

1. You applied the patch to the source, but instead it should be put into the debian/patches directory, and the patch name listed in debian/patches/series.

2. For quantal's xserver, our policy is to number patches consecutively. So you need to rename the patch, to 238-dix-fix-zaphod-screen-crossing.patch

3. In the bug report SRU, for regression potential you should elaborate more. Why might it get stuck on the second screen? There's no indication in the upstream bug report that this is possible.

4. You need a test case in the SRU as well. (Should be pretty simple.) Btw, have you reproduced the bug yourself on your own hardware? If so, that will make the SRU easier to verify - otherwise we need to find someone on quantal who can do the verification.

review: Needs Fixing

Unmerged revisions

248. By Benjamin Kerensa on 2013-01-24

add patch from upstream to fix screen crossings

247. By Timo Aaltonen on 2012-11-27

[ 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)

=== modified file 'debian/changelog'
--- debian/changelog	2012-10-08 17:58:54 +0000
+++ debian/changelog	2013-01-24 22:58:24 +0000
@@ -1,3 +1,28 @@
+xorg-server (2:1.13.0-0ubuntu6.2) quantal-proposed; urgency=low
+
+  * add  0001-dix-fix-zaphod-screen-scrossing-54654.patch to fix screen
+    crossings. (LP: #1104209)
+
+ -- Benjamin Kerensa <[e-mail]>  Thu, 24 Jan 2013 14:44:02 -0800
+
+xorg-server (2:1.13.0-0ubuntu6.1) quantal-proposed; 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)
+
+ -- Timo Aaltonen <[e-mail]>  Tue, 27 Nov 2012 08:09:59 +0200
+
 xorg-server (2:1.13.0-0ubuntu6) quantal; urgency=low
 
   [ Timo Aaltonen ]
 
=== added file 'debian/patches/233-xf86events-valgrind.patch'
--- debian/patches/233-xf86events-valgrind.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/233-xf86events-valgrind.patch	2013-01-24 22:58:24 +0000
@@ -0,0 +1,16 @@
+diff --git a/hw/xfree86/common/xf86Events.c b/hw/xfree86/common/xf86Events.c
+index 3ad34b5..4bc5f66 100644
+--- a/hw/xfree86/common/xf86Events.c
++++ b/hw/xfree86/common/xf86Events.c
+@@ -271,9 +271,9 @@ xf86Wakeup(pointer blockData, int err, pointer pReadmask)
+     }
+ 
+     if (err >= 0) {             /* we don't want the handlers called if select() */
+-        IHPtr ih;               /* returned with an error condition, do we?      */
++        IHPtr ih, ih_tmp;       /* returned with an error condition, do we?      */
+ 
+-        for (ih = InputHandlers; ih; ih = ih->next) {
++        nt_list_for_each_entry_safe(ih, ih_tmp, InputHandlers, next) {
+             if (ih->enabled && ih->fd >= 0 && ih->ihproc &&
+                 (FD_ISSET(ih->fd, ((fd_set *) pReadmask)) != 0)) {
+                 ih->ihproc(ih->fd, ih->data);
 
=== added file 'debian/patches/234-composite-borderclip.patch'
--- debian/patches/234-composite-borderclip.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/234-composite-borderclip.patch	2013-01-24 22:58:24 +0000
@@ -0,0 +1,48 @@
+compRedirectWindow does not initialize borderClip(X,Y ) members on allocation,
+which could theoretically cause a crash because borderClip contains a pointer.
+Solve this by copying the data over from pWin.
+
+Noticed this when working on
+https://bugs.launchpad.net/ubuntu/+source/xorg-server/+bug/1065113
+
+Specific error valgrind error I was receiving is:
+
+==25858== Conditional jump or move depends on uninitialised value(s)
+==25858==    at 0x1EBF32: compClipNotify (compwindow.c:304)
+==25858==    by 0x2A2C23: miComputeClips (mivaltree.c:489)
+==25858==    by 0x2A321C: miValidateTree (mivaltree.c:695)
+==25858==    by 0x1896EE: MapWindow (window.c:2594)
+==25858==    by 0x1EB15B: compCreateOverlayWindow (compoverlay.c:155)
+==25858==    by 0x1E9ABA: ProcCompositeGetOverlayWindow (compext.c:304)
+==25858==    by 0x15DA50: Dispatch (dispatch.c:428)
+==25858==    by 0x14C569: main (main.c:295)
+==25858==  Uninitialised value was created by a heap allocation
+==25858==    at 0x4C2B3F8: malloc (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so)
+==25858==    by 0x1ED4A3: compRedirectWindow (compalloc.c:172)
+==25858==    by 0x1EC142: compCreateWindow (compwindow.c:558)
+==25858==    by 0x18C56C: CreateWindow (window.c:801)
+==25858==    by 0x1EB0FF: compCreateOverlayWindow (compoverlay.c:145)
+==25858==    by 0x1E9ABA: ProcCompositeGetOverlayWindow (compext.c:304)
+==25858==    by 0x15DA50: Dispatch (dispatch.c:428)
+==25858==    by 0x14C569: main (main.c:295)
+
+Signed-off-by: Maarten Lankhorst <[e-mail]>
+
+---
+I'm not 100% sure if this is the correct assignment, I'm just guessing from the functions.
+
+diff --git a/composite/compalloc.c b/composite/compalloc.c
+index cc69c68..b6c5785 100644
+--- a/composite/compalloc.c
++++ b/composite/compalloc.c
+@@ -195,6 +195,8 @@ compRedirectWindow(ClientPtr pClient, WindowPtr pWin, int update)
+         cw->damaged = FALSE;
+         cw->pOldPixmap = NullPixmap;
+         dixSetPrivate(&pWin->devPrivates, CompWindowPrivateKey, cw);
++        cw->borderClipX = pWin->drawable.x;
++        cw->borderClipY = pWin->drawable.y;
+     }
+     ccw->next = cw->clients;
+     cw->clients = ccw;
+
+
 
=== added file 'debian/patches/235-composite-tracking.diff'
--- debian/patches/235-composite-tracking.diff	1970-01-01 00:00:00 +0000
+++ debian/patches/235-composite-tracking.diff	2013-01-24 22:58:24 +0000
@@ -0,0 +1,78 @@
+From: Michel Dänzer <[e-mail]>
+
+In particular, make sure pExaScr->src/maskPix are cleared when the
+corresponding pictures aren't associated with drawables, i.e. solid or gradient
+pictures. Without this, we would in some cases associate the source/mask region
+with unrelated pixmaps from previous Composite fallbacks, resulting in random
+corruption.
+
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=47266
+
+Signed-off-by: Michel Dänzer <[e-mail]>
+---
+ exa/exa_priv.h    |    1 +
+ exa/exa_unaccel.c |   16 ++++++++++++----
+ 2 files changed, 13 insertions(+), 4 deletions(-)
+
+diff --git a/exa/exa_priv.h b/exa/exa_priv.h
+index cd6a40b..819feb0 100644
+--- a/exa/exa_priv.h
++++ b/exa/exa_priv.h
+@@ -201,6 +201,7 @@ typedef struct {
+     RegionRec srcReg;
+     RegionRec maskReg;
+     PixmapPtr srcPix;
++    PixmapPtr maskPix;
+ 
+ } ExaScreenPrivRec, *ExaScreenPrivPtr;
+ 
+diff --git a/exa/exa_unaccel.c b/exa/exa_unaccel.c
+index 72e59ca..ec49ef0 100644
+--- a/exa/exa_unaccel.c
++++ b/exa/exa_unaccel.c
+@@ -451,6 +451,13 @@ ExaSrcValidate(DrawablePtr pDrawable,
+     RegionPtr dst;
+     int xoff, yoff;
+ 
++    if (pExaScr->srcPix == pPix)
++        dst = &pExaScr->srcReg;
++    else if (pExaScr->maskPix == pPix)
++        dst = &pExaScr->maskReg;
++    else
++        return;
++
+     exaGetDrawableDeltas(pDrawable, pPix, &xoff, &yoff);
+ 
+     box.x1 = x + xoff;
+@@ -458,8 +465,6 @@ ExaSrcValidate(DrawablePtr pDrawable,
+     box.x2 = box.x1 + width;
+     box.y2 = box.y1 + height;
+ 
+-    dst = (pExaScr->srcPix == pPix) ? &pExaScr->srcReg : &pExaScr->maskReg;
+-
+     RegionInit(&reg, &box, 1);
+     RegionUnion(dst, dst, &reg);
+     RegionUninit(&reg);
+@@ -504,16 +509,19 @@ ExaPrepareCompositeReg(ScreenPtr pScreen,
+         if (pSrc != pDst)
+             RegionTranslate(pSrc->pCompositeClip,
+                             -pSrc->pDrawable->x, -pSrc->pDrawable->y);
+-    }
++    } else
++        pExaScr->srcPix = NULL;
+ 
+     if (pMask && pMask->pDrawable) {
+         pMaskPix = exaGetDrawablePixmap(pMask->pDrawable);
+         RegionNull(&pExaScr->maskReg);
+         maskReg = &pExaScr->maskReg;
++        pExaScr->maskPix = pMaskPix;
+         if (pMask != pDst && pMask != pSrc)
+             RegionTranslate(pMask->pCompositeClip,
+                             -pMask->pDrawable->x, -pMask->pDrawable->y);
+-    }
++    } else
++        pExaScr->maskPix = NULL;
+ 
+     RegionTranslate(pDst->pCompositeClip,
+                     -pDst->pDrawable->x, -pDst->pDrawable->y);
+-- 1.7.10.4
 
=== added file 'debian/patches/236-use-fbdev-for-poulsbo-oaktrail-medfield.patch'
--- debian/patches/236-use-fbdev-for-poulsbo-oaktrail-medfield.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/236-use-fbdev-for-poulsbo-oaktrail-medfield.patch	2013-01-24 22:58:24 +0000
@@ -0,0 +1,88 @@
+From ec3ce5493ec00ca0a9304b705a58a40e364f88fb Mon Sep 17 00:00:00 2001
+From: Stefan Dirsch <[e-mail]>
+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
+
 
=== added file 'debian/patches/237-dix-set-the-device-transformation-matrix.patch'
--- debian/patches/237-dix-set-the-device-transformation-matrix.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/237-dix-set-the-device-transformation-matrix.patch	2013-01-24 22:58:24 +0000
@@ -0,0 +1,42 @@
+From 3d1051aecbb1955084804133cacd12c7f696833a Mon Sep 17 00:00:00 2001
+From: Peter Hutterer <[e-mail]>
+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 <[e-mail]>
+Reviewed-by: Chase Douglas <[e-mail]>
+Signed-off-by: Keith Packard <[e-mail]>
+---
+ 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
+
 
=== modified file 'debian/patches/series'
--- debian/patches/series	2012-10-08 17:58:54 +0000
+++ debian/patches/series	2013-01-24 22:58:24 +0000
@@ -23,6 +23,10 @@
 208_switch_on_release.diff
 227_null_ptr_midispcur.patch
 232-xf86compatoutput-valgrind.patch
+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
@@ -32,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
 
=== modified file 'dix/getevents.c'
--- dix/getevents.c	2012-09-06 12:25:51 +0000
+++ dix/getevents.c	2013-01-24 22:58:24 +0000
@@ -1400,8 +1400,9 @@
        coordinates were.
      */
     if (flags & POINTER_SCREEN) {
-        screenx = sx;
-        screeny = sy;
+        scr = miPointerGetScreen(pDev);
+        screenx = sx + scr->x;
+        screeny = sy + scr->y;
     }
 
     scr = positionSprite(pDev, (flags & POINTER_ABSOLUTE) ? Absolute : Relative,